Changeset 630 for soft/giet_vm/giet_drivers/mmc_driver.c

Timestamp:

Jul 18, 2015, 3:04:15 PM (9 years ago)

Author:

alain

Message:

Update the peripheral drivers using descheduling,
to comply with the modified NORUN bit-vector in task context.

File:

• soft/giet_vm/giet_drivers/mmc_driver.c (modified) (2 diffs)

soft/giet_vm/giet_drivers/mmc_driver.c

@@ -39 +39 @@
 
 ///////////////////////////////////////////////////////////////////////////////
-// Locks protecting MMC components (one per cluster)
-// There are two kinds of lock: the _mmc_lock table contains all the locks and
-// and is stored in the kernel data segment, whereas the _mmc_distributed_lock
-// contains the addresses of locks which are distributed in every cluster (each
-// cluster contains the lock which protects its own mmc_component).
+//     Global variables
+///////////////////////////////////////////////////////////////////////////////
+// Two kinds of locks protecting the MMC components (one per cluster):
+// - the _mmc_lock array contains spin_locks allocated in cluster[0,0].
+//   They must be used by the boot code because the kernel heap is not set.
+// - the _mmc_distributed_locks array contains pointers on distributed
+//   spin_loks allocated in the distributed heap in each cluster. 
+//   Each cluster contains the lock protecting its own mmc_component.
+//   They can be used by the kernel code. 
 // The global variable mmc_boot_mode define the type of lock which is used,
 // and must be defined in both kernel_init.c and boot.c files.
-// - the boot code must use a spin_lock because the kernel heap is not set.
-// - the kernel code can use a sqt_lock when the kernel heap is set.
-///////////////////////////////////////////////////////////////////////////////
-
-extern unsigned int  _mmc_boot_mode;
+///////////////////////////////////////////////////////////////////////////////
+
+__attribute__((section(".kdata")))
+unsigned int  _mmc_boot_mode;
 
 __attribute__((section(".kdata")))
@@ -64 +67 @@
 void _mmc_init_locks()
 {
-    unsigned int cx;    // cluster X coordinate
-    unsigned int cy;    // cluster Y coordinate
+    unsigned int x;    // cluster X coordinate
+    unsigned int y;    // cluster Y coordinate
     
-    for ( cx = 0 ; cx < X_SIZE ; cx++ )
-    {
-        for ( cy = 0 ; cy < Y_SIZE ; cy++ )
+    for ( x = 0 ; x < X_SIZE ; x++ )
+    {
+        for ( y = 0 ; y < Y_SIZE ; y++ )
         {
-            _mmc_distributed_lock[cx][cy] = _remote_malloc( sizeof(spin_lock_t), cx, cy );
-            _spin_lock_init( _mmc_distributed_lock[cx][cy] );
+            if ( _mmc_boot_mode )
+            {
+                _spin_lock_init( &_mmc_lock[x][y] );
+            }
+            else
+            {
+                _mmc_distributed_lock[x][y] = _remote_malloc( sizeof(spin_lock_t), x, y );
+                _spin_lock_init( _mmc_distributed_lock[x][y] );
+            }
         }
     }