Changeset 279 for soft

Timestamp:

Jan 26, 2014, 11:29:15 AM (11 years ago)

Author:

cfuguet

Message:

Modifications in the ioc_driver:

• Introducing uniform interface to access block device controller. All drivers for new disk controllers must respect the interface specified in the ioc_driver header file.

Location:

soft/giet_vm

Files:

• giet_drivers/ioc_driver.c (modified) (5 diffs)
• giet_drivers/ioc_driver.h (modified) (1 diff)
• giet_kernel/irq_handler.c (modified) (1 diff)

soft/giet_vm/giet_drivers/ioc_driver.c

@@ -315 +315 @@
         else             ioc_address[BLOCK_DEVICE_OP] = BLOCK_DEVICE_READ;
 
-        unsigned int status = _ioc_get_status();
+        unsigned int status;
+        if ( _ioc_get_status(0, &status) ) return 1;
+
         while( (status != BLOCK_DEVICE_READ_SUCCESS)  &&
                (status != BLOCK_DEVICE_READ_ERROR)    &&
@@ -321 +323 @@
                (status != BLOCK_DEVICE_WRITE_ERROR) ) 
         {
-            status = _ioc_get_status();
+            if ( _ioc_get_status(0, &status) ) return 1;
 
 #if GIET_DEBUG_IOC_DRIVER
@@ -392 +394 @@
 unsigned int _ioc_init()
 {
-    unsigned int * ioc_address = (unsigned int *) &seg_ioc_base ;
+    volatile unsigned int * ioc_address = (unsigned int *) &seg_ioc_base ;
     
     if ( ioc_address[BLOCK_DEVICE_BLOCK_SIZE] != 512 )
@@ -448 +450 @@
 ///////////////////////////////////////////////////////////////////////////////
 //     _ioc_get_status()
-// This function returns the transfert status, and acknowledge the IRQ
-// if the IOC controler is not busy.
-///////////////////////////////////////////////////////////////////////////////
-unsigned int _ioc_get_status() 
-{
+// This function returns in the status variable, the transfert status, and
+// acknowledge the IRQ if the IOC controler is not busy.
+// Returns 0 if success, > 0 if error
+///////////////////////////////////////////////////////////////////////////////
+unsigned int _ioc_get_status( unsigned int  channel,
+                              unsigned int* status )
+{
+    if ( channel != 0 )
+    {
+        _tty_get_lock( 0 );
+        _puts("\n[GIET ERROR] in _ioc_get_status : illegal channel\n");
+        _tty_release_lock( 0 );
+
+        return 1;
+    }
+
     // get IOC base address
-    unsigned int * ioc_address = (unsigned int *) &seg_ioc_base;
-
-    return ioc_address[BLOCK_DEVICE_STATUS];
+    volatile unsigned int * ioc_address = (unsigned int *) &seg_ioc_base;
+    *status = ioc_address[BLOCK_DEVICE_STATUS];
+
+    return 0;
 }
 
@@ -466 +480 @@
 {
     // get IOC base address
-    unsigned int * ioc_address = (unsigned int *) &seg_ioc_base;
+    volatile unsigned int * ioc_address = (unsigned int *) &seg_ioc_base;
     
     return  ioc_address[BLOCK_DEVICE_BLOCK_SIZE];

soft/giet_vm/giet_drivers/ioc_driver.h

@@ -71 +71 @@
                                 unsigned int count );
 
-extern unsigned int _ioc_get_status();
+extern unsigned int _ioc_get_status( unsigned int  channel,
+                                     unsigned int* status );
 
 extern unsigned int _ioc_get_block_size();

soft/giet_vm/giet_kernel/irq_handler.c

@@ -151 +151 @@
 {
     // save status in _ioc_status variable and reset IRQ 
-    _ioc_status = _ioc_get_status(); 
+    if ( _ioc_get_status(0, &_ioc_status) ) return; 
 
     // reactivate task waiting on IOC