Changeset 388 for trunk/softs/tsar_boot/src/boot_ioc.c

Timestamp:

May 16, 2013, 3:01:37 PM (11 years ago)

Author:

cfuguet

Message:

Modifications in tsar/trunk/softs/tsar_boot:

• Improving the boot_ioc_read when using a SD card in FPGA platform.
• Adding some instrumentation on the SD card driver (under preprocessor conditional directives).
• Including Doxyfile for generate documentation using doxygen.
• Improving the Makefile to include doc generation.

File:

• trunk/softs/tsar_boot/src/boot_ioc.c (modified) (7 diffs)

trunk/softs/tsar_boot/src/boot_ioc.c

@@ -2 +2 @@
 
 #ifndef SOCLIB_IOC
+
+static struct sdcard_dev  _sdcard_device;
+static struct spi_dev   * _spi_device   = ( struct spi_dev * )IOC_BASE;
 
 #ifndef SYSCLK_FREQ
 #warning "Using default value for SYSCLK_FREQ = 50000000"
 #define SYSCLK_FREQ 50000000U
-#endif
-
-static struct sdcard_dev  _sdcard_device;
-static struct spi_dev   * _spi_device   = ( struct spi_dev * )IOC_BASE;
-#endif
-
-
+#endif // end ifndef SYSCLK_FREQ
+
+#endif // end ifndef SOCLIB_IOC
+
+#define SDCARD_RESET_ITER_MAX 4
+
+inline void boot_sleep(int cycles)
+{
+    int i;
+    for (i = 0; i < cycles; i++);
+}
+
+#if INSTRUMENTATION
+inline unsigned int boot_proctime()
+{
+    unsigned int ret;
+    asm volatile ("mfc0 %0, $9":"=r" (ret));
+    return ret;
+}
+#endif // end if INSTRUMENTATION
+
+#ifndef SOCLIB_IOC
 int boot_ioc_init()
 {
-#ifdef SOCLIB_IOC
-    return 0;
-#else
     unsigned char sdcard_rsp;
 
@@ -37 +52 @@
      * Initializing the SD Card
      */
-    if ( (sdcard_rsp = sdcard_dev_open(&_sdcard_device, _spi_device, 0)) )
-        return sdcard_rsp;
-
-    if ( (sdcard_rsp = sdcard_dev_set_blocklen(&_sdcard_device, 512)) )
-        return sdcard_rsp;
+    unsigned int iter = 0;
+    while(1) 
+    {
+        boot_puts("Trying to initialize SD card... ");
+
+        sdcard_rsp = sdcard_dev_open(&_sdcard_device, _spi_device, 0);
+        if (sdcard_rsp == 0)
+        {
+            boot_puts("OK\n");
+            break;
+        }
+
+        boot_puts("KO\n");
+        boot_sleep(1000);
+        if (++iter >= SDCARD_RESET_ITER_MAX)
+        {
+            boot_puts("\nERROR: During SD card reset to IDLE state\n"
+                      "/ card response = ");
+            boot_putx(sdcard_rsp);
+            boot_puts("\n");
+            boot_exit();
+        }
+    }
+
+    /**
+     * Set the block length of the SD Card
+     */
+    sdcard_rsp = sdcard_dev_set_blocklen(&_sdcard_device, 512);
+    if (sdcard_rsp)
+    {
+        boot_puts("ERROR: During SD card blocklen initialization\n");
+        boot_exit();
+    }
 
     /**
@@ -48 +91 @@
     spi_dev_config (
         _spi_device ,
-        10000000    , /**< SPI_clkL 10 Mhz */
-        SYSCLK_FREQ , /**< Sys_clk         */
-        -1          , /**< Charlen: 8      */
+        10000000    , /**< SPI_clk 10 Mhz */
+        SYSCLK_FREQ , /**< Sys_clk        */
+        -1          , /**< Charlen: 8     */
         -1          ,
         -1
@@ -58 +101 @@
 
     return 0;
-#endif
-}
+}
+#endif // end ifndef SOCLIB_IOC
 
 /**
@@ -137 +180 @@
 
 #else
+
 ///////////////////////////////////////////////////////////////////////////////
 // FPGA version of the boot_ioc_read function
@@ -143 +187 @@
 {
     unsigned int sdcard_rsp;
+    unsigned int i;
 
     sdcard_dev_lseek(&_sdcard_device, lba);
 
-    unsigned int i;
+#if INSTRUMENTATION
+    unsigned int start_time;
+    unsigned int end_time;
+    boot_puts("[ DEBUG ] Reading blocks ");
+    boot_putd(lba);
+    boot_puts(" to ");
+    boot_putd(lba + count - 1);
+
+    start_time = boot_proctime();
+#endif
+
     for(i = 0; i < count; i++)
     {
@@ -161 +216 @@
 
             return 1;
-        }   
-    }
+        }
+    }
+
+#if INSTRUMENTATION
+    end_time = boot_proctime();
+
+    boot_puts(" / cycles for transfert: ");
+    boot_putd(end_time - start_time);
+    boot_puts("\n");
+#endif
 
     return 0;