Changeset 529 for soft/giet_vm/giet_drivers/sdc_driver.c

Timestamp:

Mar 27, 2015, 11:51:33 AM (9 years ago)

Author:

alain

Message:

1) Removing the IOC driver (integrated in the FAT library).
2) Simplifying the BDV, HBA, SDC, RDK drivers: they support
only two modes (synchronous => polling / descheduling => IRQ),
and only one access function (for both read/write).

File:

• soft/giet_vm/giet_drivers/sdc_driver.c (modified) (3 diffs)

soft/giet_vm/giet_drivers/sdc_driver.c

@@ -372 +372 @@
     if (sdcard_rsp)
     {
-        _puts("[SDC ERROR] During SD card blocklen initialization\n");
+        _puts("[SDC ERROR] During SD card block size initialization\n");
         _exit();
     }
@@ -389 +389 @@
 
     return 0;
-}
-
-
-//////////////////////////////////////////
-unsigned int _sdc_read( unsigned int mode,
-                        unsigned int lba,
-                        paddr_t      buffer,
-                        unsigned int count )
+} // end _sdc_init()
+
+
+/////////////////////////////////////////////////////
+unsigned int _sdc_access( unsigned int       use_irq,  // unused
+                          unsigned int       to_mem,
+                          unsigned int       lba,
+                          unsigned long long buf_paddr,
+                          unsigned int       count )
 {
     unsigned char args[4];
@@ -404 +405 @@
     unsigned int last = lba + count;
 
-    for ( ; curr < last ; curr++ )
-    {
-        _sdc_lseek(curr);
-
-        for (i = 0; i < 4; i++)
-        {
-            args[i] = (sdcard.access_pointer >> (32 - (i+1)*8)) & 0xFF;
+    if ( to_mem )  // read access
+    {
+        for ( ; curr < last ; curr++ )
+        {
+            _sdc_lseek(curr);
+
+            for (i = 0; i < 4; i++)
+            {
+                args[i] = (sdcard.access_pointer >> (32 - (i+1)*8)) & 0xFF;
+            }
+
+            _sdc_enable();
+
+            sdcard_rsp = _sdc_send_command(17, SDCARD_CMD, args, 0x00);
+            if ( SDCARD_CHECK_R1_ERROR(sdcard_rsp) )
+            {
+                _sdc_disable();
+                return sdcard_rsp;
+            }
+
+            _sdc_wait_data_block();
+
+            if (spi_get_data(sdcard.spi, buf_paddr, 512 ))
+            {
+                _sdc_disable();
+                return 1;
+            }
+
+            // Get the CRC16 (comes at the end of the data block)
+            _sdc_receive_char(); // first byte
+            _sdc_receive_char(); // second byte
+
+            _sdc_disable();
+
+            buf_paddr += 512;
         }
-
-        _sdc_enable();
-
-        sdcard_rsp = _sdc_send_command(17, SDCARD_CMD, args, 0x00);
-        if ( SDCARD_CHECK_R1_ERROR(sdcard_rsp) )
-        {
-            _sdc_disable();
-            return sdcard_rsp;
-        }
-
-        _sdc_wait_data_block();
-
-        if (spi_get_data(sdcard.spi, buffer, 512 ))
-        {
-            _sdc_disable();
-            return 1;
-        }
-
-        // Get the CRC16 (comes at the end of the data block)
-        _sdc_receive_char(); // first byte
-        _sdc_receive_char(); // second byte
-
-        _sdc_disable();
-
-        buffer += 512;
+    }
+    else            // write access
+    {
+        _printf("[SDC ERROR] function _sdc_write() not iplemented yet\n");
+        _exit();
     }
 
     return 0;
-}
-
-///////////////////////////////////////////
-unsigned int _sdc_write( unsigned int mode,
-                         unsigned int lba,
-                         paddr_t      buffer,
-                         unsigned int count )
-{
-    _puts("[SDC ERROR] function _sdc_write() not iplemented yet\n");
-    _exit();
-
-    return 0;  // to avoid a warning
-}
-
-//////////////////////////////
-unsigned int _sdc_get_status()
-{
-    _puts("[SDC ERROR] function _sdc_get_status() should not be called\n");
-    _exit();
-
-    return 0;  // to avoid a warning
-}
-
-//////////////////////////////////
-unsigned int _sdc_get_block_size()
-{
-    if (sdcard.sdhc) return sdcard.block_length*512;
-    else             return sdcard.block_length;
-}
+}  // _end sdc_access()
 
 // Local Variables: