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

Timestamp:

Mar 26, 2014, 6:44:44 PM (11 years ago)

Author:

alain

Message:

Introducing a major release, to suppoort the tsar_generic_leti platform
and the various (external or internal) peripherals configurations.
The map.xml format has been modified, in order to support the new
vci_iopic componentand a new policy for peripherals initialisation.
The IRQs are nom described in the XICU and IOPIC components
(and not anymore in the processors).
To enforce this major change, the map.xml file signature changed:
The signature value must be: 0xDACE2014

This new release has been tested on the tsar_generic_leti platform
for the following mappings:

• 4c_4p_sort_leti
• 4c_4p_sort_leti_ext
• 4c_4p_transpose_leti
• 4c_4p_transpose_leti_ext
• 4c_1p_four_leti_ext

File:

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

soft/giet_vm/giet_drivers/sdc_driver.c

@@ -5 +5 @@
 // Copyright (c) UPMC-LIP6
 ///////////////////////////////////////////////////////////////////////////////////
+
 #include <sdc_driver.h>
+#include <tty_driver.h>
 #include <utils.h>
 
@@ -179 +181 @@
         if ( sdcard_rsp != 0x01 )
         {
-
-                _puts("card CMD0 failed ");
+                _printf("[SDC ERROR] card CMD0 failed\n");
                 return sdcard_rsp;
         }
@@ -196 +197 @@
         if (!SDCARD_CHECK_R1_VALID(sdcard_rsp))
     {
-                _puts("card CMD8 failed ");
+                _printf("[SDC ERROR] card CMD8 failed\n");
                 return sdcard_rsp;
         }
@@ -206 +207 @@
                 ersp = (ersp << 8) | _sdc_receive_char();
                 ersp = (ersp << 8) | _sdc_receive_char();
-                if ((ersp & 0xffff) != 0x0101) {
+                if ((ersp & 0xffff) != 0x0101) 
+        {
                         // voltage mismatch
-                        _puts("card CMD8 mismatch: ");
-                        _putx(ersp);
+                        _printf("[SDC ERROR] card CMD8 mismatch : ersp = %x\n");
                         return sdcard_rsp;
                 }
-                _puts("v2 or later ");
+                _printf("[SDC WARNING] v2 or later ");
                 sdcard.sdhc = 1;
         }
@@ -218 +219 @@
     {
                 // other error
-                _puts("card CMD8 error ");
+                _printf("[SDC ERROR] card CMD8 error\n");
                 return sdcard_rsp;
         }
@@ -249 +250 @@
         if (sdcard_rsp)
     {
-                _puts("SD ACMD41 failed ");
+                _printf("[SDC ERROR] ACMD41 failed\n");
                 return sdcard_rsp;
         }
@@ -263 +264 @@
                 if (sdcard_rsp)
         {
-                        _puts("SD CMD58 failed ");
+                        _printf("[SDC ERROR] CMD58 failed\n");
                         return sdcard_rsp;
                 }
@@ -272 +273 @@
                 if (ersp & 0x40000000)
         {
-                        _puts("SDHC ");
-                } else
+                        _printf(" SDHC ");
+                } 
+        else
         {
                         sdcard.sdhc = 0;
@@ -279 +281 @@
                 _sdc_disable();
         }
-        _puts("card detected ");
+        _printf("card detected\n");
         return 0;
 }
@@ -334 +336 @@
 // Returns 0 if success, other value if failure
 ///////////////////////////////////////////////////////////////////////////////
-unsigned int _sdc_init( unsigned int channel )
+unsigned int _sdc_init()
 {
     spi = (struct spi_dev*) &seg_ioc_base;
@@ -355 +357 @@
     while(1)
     {
-        _puts("Trying to initialize SD card... ");
-
-        sdcard_rsp = _sdc_open( channel );
+        _printf("[SDC WARNING] Trying to initialize SD card...\n");
+
+        sdcard_rsp = _sdc_open( 0 );  // only channel 0
         if (sdcard_rsp == 0)
         {
-            _puts("OK\n");
+            _printf("OK\n");
             break;
         }
 
-        _puts("KO\n");
+        _printf("KO\n");
 
         for (i = 0; i < 1000; i++);
@@ -370 +372 @@
         if (++iter >= SDCARD_RESET_ITER_MAX)
         {
-            _puts("\nERROR: During SD card reset to IDLE state\n"
-                 "/ card response = ");
-            _putx(sdcard_rsp);
-            _puts("\n");
+            _printf("\n[SDC ERROR] During SD card reset to IDLE state "
+                    "/ card response = %x\n", sdcard_rsp );
             _exit();
         }
@@ -382 +382 @@
     if (sdcard_rsp)
     {
-        _puts("ERROR: During SD card blocklen initialization\n");
+        _printf("[SDC ERROR] During SD card blocklen initialization\n");
         _exit();
     }
@@ -396 +396 @@
     );
 
-    _puts("Finish block device initialization\n\r");
+    _printf("[SDC WARNING] Finish SD card initialization\n\r");
 
     return 0;
@@ -478 +478 @@
 
 ///////////////////////////////////////////////////////////////////////////////
-//     _sdc_get_status()
 // Transfer data from memory buffer to SD card device. 
 // - channel: channel index
@@ -484 +483 @@
 // Returns 0 if success, > 0 if error.
 ///////////////////////////////////////////////////////////////////////////////
-unsigned int _sdc_get_status( unsigned int channel ,
-                              unsigned int* status )
-{
-    *status = BLOCK_DEVICE_IDLE;
-
-    return 0;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-//     _sdc_get_block_size()
+unsigned int _sdc_get_status()
+{
+    _printf("[SDC ERROR] function _sdc_get_status() should not be called\n");
+    _exit();
+
+    return 0;  // to avoid a warning
+}
+
+///////////////////////////////////////////////////////////////////////////////
 // Returns the block size in bytes of the SD card
 ///////////////////////////////////////////////////////////////////////////////