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

Timestamp:

Feb 4, 2014, 2:16:37 AM (11 years ago)

Author:

cfuguet

Message:

Modifications on GIET-VM IOC driver:

• Introducing new layer on the IOC driver. Every call to ioc_read, ioc_write, ioc_get_block_size or ioc_init

functions will call the specific driver of the used IOC
controller. Supported IOC controllers are (for now) :

1. BDV (Soclib Block Device)
2. HBA
3. SPI (SDCARD - SPI controller)

• All functions of IOC controllers drivers respect the same interface.

• To specify the used IOC controller of the platform, a subtype field has been introduced on the map.xml file. This subtype field must be declared on the IOC periph instantiation. Available subtypes (for now) : BDV, HBA or SPI.

File:

• soft/giet_vm/giet_drivers/bdv_driver.c (copied) (copied from branch/giet_vm_ioc_drivers/giet_drivers/bdv_driver.c) (4 diffs)

soft/giet_vm/giet_drivers/bdv_driver.c

@@ -64 +64 @@
 // Arguments are:
 // - to_mem     : from external storage to memory when non 0.
-// - kernel     : kernel buffer with identity mapping when non 0. 
+// - mode       : BOOT / KERNEL / USER
 // - lba        : first block index on the external storage.
-// - buf_vaddr  : virtual base address of the memory buffer.
+// - buf_paddr  : physical base address of the memory buffer.
 // - count      : number of blocks to be transfered.
 // Returns 0 if success, > 0 if error.
@@ -109 +109 @@
     ioc_address[BLOCK_DEVICE_LBA]        = lba;
 
-    // There is two policies for transfer completion 
+    // There are two policies for transfer completion 
         // detection, depending on the mode argument:
 
@@ -120 +120 @@
 
         unsigned int status;
-        if ( _bdv_get_status(0, &status) ) return 1;
-
-        while( (status != BLOCK_DEVICE_READ_SUCCESS)  &&
-               (status != BLOCK_DEVICE_READ_ERROR)    &&
-               (status != BLOCK_DEVICE_WRITE_SUCCESS) &&
-               (status != BLOCK_DEVICE_WRITE_ERROR) ) 
+        do
         {
-            if ( _bdv_get_status(0, &status) ) return 1;
+            if ( _bdv_get_status( 0, &status ) ) return 1;
 
 #if GIET_DEBUG_IOC_DRIVER
@@ -134 +129 @@
 _tty_release_lock( 0 );
 #endif
-
         }
+        while( (status != BLOCK_DEVICE_READ_SUCCESS)  &&
+               (status != BLOCK_DEVICE_READ_ERROR)    &&
+               (status != BLOCK_DEVICE_WRITE_SUCCESS) &&
+               (status != BLOCK_DEVICE_WRITE_ERROR)   );
+
         // analyse status
         error = ( (status == BLOCK_DEVICE_READ_ERROR) ||