Changeset 657 for soft

Timestamp:

Jul 22, 2015, 5:36:05 PM (9 years ago)

Author:

alain

Message:

Cosmetic.

Location:

soft/giet_vm/giet_drivers

Files:

• bdv_driver.c (modified) (1 diff)
• hba_driver.c (modified) (2 diffs)
• sdc_driver.c (modified) (5 diffs)

soft/giet_vm/giet_drivers/bdv_driver.c

@@ -171 +171 @@
         // Set NORUN_MASK_IOC bit 
         static_scheduler_t* psched  = (static_scheduler_t*)_schedulers[x][y][p];
-        unsigned int*       ptr     = &psched->context[ltid][CTX_NORUN_ID];
-        _atomic_or( ptr , NORUN_MASK_IOC );
+        _atomic_or( &psched->context[ltid][CTX_NORUN_ID] , NORUN_MASK_IOC );
         
         // launch transfer

soft/giet_vm/giet_drivers/hba_driver.c

@@ -98 +98 @@
 ///////////////////////////////////////////////////////////////////////////////
 // This blocking fonction allocates a free command index to the task. 
-// The hba_allocator_lock is used except in boot mode.
+// The hba_allocator_lock is not used in boot mode.
 // It returns the allocated command index (between 0 and 31)
 ///////////////////////////////////////////////////////////////////////////////
@@ -448 +448 @@
             // Reset NORUN_MASK_IOC bit 
             static_scheduler_t* psched  = (static_scheduler_t*)_schedulers[x][y][p];
-            unsigned int*       ptr     = &psched->context[ltid][CTX_NORUN_ID];
-            _atomic_and( ptr , ~NORUN_MASK_IOC );
+            _atomic_and( &psched->context[ltid][CTX_NORUN_ID] , ~NORUN_MASK_IOC );
 
             // send a WAKUP WTI to processor running the waiting task 

soft/giet_vm/giet_drivers/sdc_driver.c

@@ -484 +484 @@
     for ( current = _ahci_cmd_ptr ; current != _ahci_cmd_ptw ; current++ )
     {
-        unsigned int ptr = current & 0x1F;
+        unsigned int cmd_id = current & 0x1F;
         
-        if ( (pxci & (1<<ptr)) == 0 )    // command completed
+        if ( (pxci & (1<<cmd_id)) == 0 )    // command completed
         {
             // increment the 32 bits variable _ahci_cmd_ptr
@@ -492 +492 @@
 
             // save AHCI_PXIS register
-            _ahci_status[ptr] = _sdc_get_register( AHCI_PXIS );
+            _ahci_status[cmd_id] = _sdc_get_register( AHCI_PXIS );
 
             // reset AHCI_PXIS register
@@ -498 +498 @@
  
             // identify waiting task 
-            unsigned int procid  = _ahci_gtid[ptr]>>16;
-            unsigned int ltid    = _ahci_gtid[ptr] & 0xFFFF;
+            unsigned int procid  = _ahci_gtid[cmd_id]>>16;
+            unsigned int ltid    = _ahci_gtid[cmd_id] & 0xFFFF;
             unsigned int cluster = procid >> P_WIDTH;
             unsigned int x       = cluster >> Y_WIDTH;
@@ -507 +507 @@
             // Reset NORUN_MASK_IOC bit 
             static_scheduler_t* psched  = (static_scheduler_t*)_schedulers[x][y][p];
-            unsigned int*       ptr     = &psched->context[ltid][CTX_NORUN_ID];
-            _atomic_and( ptr , ~NORUN_MASK_IOC );
+            _atomic_and( &psched->context[ltid][CTX_NORUN_ID] , ~NORUN_MASK_IOC );
 
             // send a WAKUP WTI to processor running the waiting task 
@@ -519 +518 @@
 _printf("\n[DEBUG SDC] _sdc_isr() : command %d completed at cycle %d\n"
         "  resume task %d running on P[%d,%d,%d] / status = %x\n",
-        ptr , _get_proctime() ,
-        ltid , x , y , p , _ahci_status[ptr] );
+        cmd_id , _get_proctime() ,
+        ltid , x , y , p , _ahci_status[cmd_id] );
 #endif
         }