Changeset 456 for soft/giet_vm/giet_drivers/bdv_driver.c

Timestamp:

Dec 5, 2014, 3:38:31 PM (10 years ago)

Author:

alain

Message:

Defining the NIC and CMA drivers (validated by the classif application).
Updating other drivers to comply with the new tty0 common file.

File:

• soft/giet_vm/giet_drivers/bdv_driver.c (modified) (5 diffs)

soft/giet_vm/giet_drivers/bdv_driver.c

@@ -20 +20 @@
 #include <ioc_driver.h>
 #include <utils.h>
-#include <tty_driver.h>
+#include <tty0.h>
 #include <ctx_handler.h>
 
-#if !defined(GIET_NO_HARD_CC)
-# error: You must define GIET_NO_HARD_CC in the giet_config.h file
-#endif
-
 ///////////////////////////////////////////////////////////////////////////////
 // BDV global variables
 ///////////////////////////////////////////////////////////////////////////////
 
-#define in_unckdata __attribute__((section (".unckdata")))
-#define in_kdata __attribute__((section (".kdata")))
-
-#if GIET_NO_HARD_CC
-in_unckdata giet_lock_t           _bdv_lock __attribute__((aligned(64)));
-in_unckdata volatile unsigned int _bdv_status;
-in_unckdata volatile unsigned int _bdv_gtid;
-#else
-in_kdata giet_lock_t           _bdv_lock __attribute__((aligned(64)));
-in_kdata volatile unsigned int _bdv_status;
-in_kdata volatile unsigned int _bdv_gtid;
-#endif
+spin_lock_t  _bdv_lock __attribute__((aligned(64)));
+unsigned int _bdv_status;
+unsigned int _bdv_gtid;
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -110 +97 @@
 
     // get the lock protecting BDV
-    _get_lock(&_bdv_lock);
-
-#if GIET_DEBUG_IOC_DRIVER
-_puts("\n[BDV DEBUG] _bdv_access() : P[");
-_putd( x );
-_puts(",");
-_putd( y );
-_puts(",");
-_putd( p );
-_puts("] get bdv_lock at cycle ");
-_pud( _get_proctime() );
+    _lock_acquire( &_bdv_lock );
+
+#if GIET_DEBUG_IOC_DRIVER
+_puts("\n[BDV DEBUG] _bdv_access() : P[");
+_putd( x );
+_puts(",");
+_putd( y );
+_puts(",");
+_putd( p );
+_puts("] get _bdv_lock at cycle ");
+_putd( _get_proctime() );
 _puts("\n");
 #endif
@@ -172 +159 @@
 
         // release lock
-        _release_lock(&_bdv_lock);      
+        _lock_release( &_bdv_lock );      
     }
     // in USER or KERNEL mode, we deschedule the task.
@@ -233 +220 @@
         // reset _bdv_status and release lock
         _bdv_status = BLOCK_DEVICE_IDLE; 
-        _release_lock(&_bdv_lock);      
+        _lock_release( &_bdv_lock );      
     }
 
@@ -246 +233 @@
 _putd( _get_proctime() );
 _puts(" / error = ");
-_putd( error )
+_putd( error );
 _puts("\n");
 #endif