Changeset 715 for soft/giet_vm/giet_drivers

Timestamp:

Oct 7, 2015, 12:05:03 PM (9 years ago)

Author:

alain

Message:

Cosmetic.

Location:

soft/giet_vm/giet_drivers

Files:

• bdv_driver.c (modified) (2 diffs)
• hba_driver.c (modified) (7 diffs)

soft/giet_vm/giet_drivers/bdv_driver.c

@@ -33 +33 @@
 ///////////////////////////////////////////////////////////////////////////////
 
-// lock protecting single channel BDV peripheral
+// lock protecting exclusive access
 __attribute__((section(".kdata")))
-spin_lock_t  _bdv_lock __attribute__((aligned(64)));
-
-// global index of the waiting thread (only used in descheduling mode)
+spin_lock_t      _bdv_lock __attribute__((aligned(64)));
+
+// owner thread (only used in descheduling mode)
 __attribute__((section(".kdata")))
-unsigned int _bdv_trdid;
-
-// BDV peripheral status (only used in descheduling mode)
+unsigned int     _bdv_trdid;
+
+// transfer status (only used in descheduling mode)
 __attribute__((section(".kdata")))
-unsigned int _bdv_status;
-
-///////////////////////////////////////////////////////////////////////////////
-// This low_level function returns the value contained in register (index).
+unsigned int     _bdv_status;
+
+///////////////////////////////////////////////////////////////////////////////
+// This low_level function returns the value contained in register(index).
 ///////////////////////////////////////////////////////////////////////////////
 unsigned int _bdv_get_register( unsigned int index )
@@ -55 +55 @@
 
 ///////////////////////////////////////////////////////////////////////////////
-// This low-level function set a new value in register (index).
+// This low-level function set a new value in register(index).
 ///////////////////////////////////////////////////////////////////////////////
 void _bdv_set_register( unsigned int index,

soft/giet_vm/giet_drivers/hba_driver.c

@@ -28 +28 @@
 
 // allocated in the boot.c or kernel_init.c files
-extern static_scheduler_t* _schedulers[X_SIZE][Y_SIZE][NB_PROCS_MAX]; 
+extern static_scheduler_t*    _schedulers[X_SIZE][Y_SIZE][NB_PROCS_MAX]; 
+extern unsigned int           _hba_boot_mode;  
 
 //////////////////////////////////////////////////////////////////////////////////
@@ -36 +37 @@
 // and must be defined in both kernel_init.c and boot.c files.
 // - during the boot phase, only one processor access the HBA in synchronous
-//   mode. There is no need for the allocator to use a lock.
-// - after the boot phase, the HBA device can be used by several processors. The
-//   allocator is protected by a sqt_lock.
+//   mode. There is no need to use a lock.
+// - during the execution phase, the HBA device can be used by several processors. 
+//   The slot allocator is protected by a sqt_lock.
 //////////////////////////////////////////////////////////////////////////////////
         
-extern unsigned int _hba_boot_mode;
-
-__attribute__((section(".kdata")))
-sqt_lock_t          _hba_allocator_lock  __attribute__((aligned(64)));
+__attribute__((section(".kdata")))
+sqt_lock_t          _hba_lock  __attribute__((aligned(64)));
 
 // state of each slot (allocated to a thread or not)
@@ -98 +97 @@
 ///////////////////////////////////////////////////////////////////////////////
 // This blocking fonction allocates a free command index to the thread. 
-// The hba_allocator_lock is not used in boot mode.
+// The hba_lock is not used in boot mode.
 // It returns the allocated command index (between 0 and 31)
 ///////////////////////////////////////////////////////////////////////////////
@@ -109 +108 @@
     while ( found == 0)
     {
-        if ( !_hba_boot_mode )
-            _sqt_lock_acquire(&_hba_allocator_lock);
+        if ( !_hba_boot_mode ) _sqt_lock_acquire(&_hba_lock);
 
         for ( c = 0; c < 32 ; c++ )
@@ -123 +121 @@
         }
 
-        if ( !_hba_boot_mode )
-            _sqt_lock_release(&_hba_allocator_lock);
+        if ( !_hba_boot_mode ) _sqt_lock_release(&_hba_lock);
     }
 
@@ -379 +376 @@
     // initialise allocator lock if not in boot mode
     if ( !_hba_boot_mode )
-        _sqt_lock_init(&_hba_allocator_lock);
+        _sqt_lock_init(&_hba_lock);
 
     // initialise Command Descriptors in Command List, allocated command table
@@ -390 +387 @@
         _hba_cmd_list[c].ctba  = (unsigned int)(paddr);
         _hba_cmd_list[c].ctbau = (unsigned int)(paddr>>32);
-        _hba_allocated_cmd[c] = 0;
-        _hba_active_cmd[c] = 0;
+        _hba_allocated_cmd[c]  = 0;
+        _hba_active_cmd[c]     = 0;
     }