Changeset 962 for trunk/softs/tsar_boot/src

Timestamp:

Apr 1, 2015, 3:42:03 PM (10 years ago)

Author:

alain

Message:

Introducing a new IOC driver supporting the VciMultiAhci? disk controller (in polling mode only).
Extending the MMC driver to support the SYNC command requested by the AHCI protocol on the tsar_generic_iob platform.

Location:

trunk/softs/tsar_boot/src

Files:

• reset_elf_loader.c (modified) (1 diff)
• reset_ioc.c (modified) (5 diffs)
• reset_utils.c (modified) (2 diffs)

trunk/softs/tsar_boot/src/reset_elf_loader.c

@@ -43 +43 @@
         goto error;
     }
+
+#if (RESET_DEBUG == 1)
+    reset_display_block( (char*)&elf_header );
+#endif
+
     check_elf_header(&elf_header);
 

trunk/softs/tsar_boot/src/reset_ioc.c

@@ -7 +7 @@
  *
  * \note   These functions call the specific disk controller driver depending
- *         on the USE_IOC_BDV, USE_IOC_SPI or USE_IOC_RDK constants
+ *         on the USE_IOC_BDV, USE_IOC_SDC or USE_IOC_RDK constants
  */
 
@@ -13 +13 @@
 #include <defs.h>
 
-#if !defined(USE_IOC_BDV) && !defined(USE_IOC_SPI) && !defined(USE_IOC_RDK)
-#   error "One of the USE_IOC_* constants must be defined in the hard_config.h"
+#if (USE_IOC_BDV + USE_IOC_SDC + USE_IOC_RDK + USE_IOC_HBA) != 1
+#   error "in reset_ioc.c : undefined disk controller in hard_config.h"
 #endif
 
-#if (USE_IOC_BDV + USE_IOC_SPI + USE_IOC_RDK) != 1
-#   error "Only one disk controller must be used"
-#endif
-
-#if USE_IOC_SPI
+#if USE_IOC_SDC
 #include <reset_sdc.h>
 #endif
@@ -33 +29 @@
 #endif
 
+#if USE_IOC_HBA
+#include <reset_hba.h>
+#endif
+
+
 /**
  * \brief Initialize the disk controller
@@ -40 +41 @@
 #if USE_IOC_BDV
     return reset_bdv_init();
-#elif USE_IOC_SPI
+#elif USE_IOC_SDC
     return reset_sdc_init();
 #elif USE_IOC_RDK
     return reset_rdk_init();
+#elif USE_IOC_HBA
+    return reset_hba_init();
 #else
-#   error "reset_ioc_init() : Not supported disk controller chosen"
+#   error "in reset_ioc_init.c : undefined disk controller in hard_config.h"
 #endif
 }
@@ -63 +66 @@
 #if USE_IOC_BDV
     return reset_bdv_read(lba, buffer, count);
-#elif USE_IOC_SPI
+#elif USE_IOC_SDC
     return reset_sdc_read(lba, buffer, count);
 #elif USE_IOC_RDK
     return reset_rdk_read(lba, buffer, count);
+#elif USE_IOC_HBA
+    return reset_hba_read(lba, buffer, count);
 #else
-#   error "reset_ioc_read() : Not supported disk controller chosen"
+#   error "in reset_ioc_read.c : undefined disk controller in hard_config.h"
 #endif
 }

trunk/softs/tsar_boot/src/reset_utils.c

@@ -178 +178 @@
         (ehdr->e_ident[EI_MAG3] != ELFMAG3))
     {
-        reset_puts("[RESET ERROR] Unrecognized file format (not an ELF format)\n");
+        reset_puts("\n[RESET ERROR] Unrecognized file format (not an ELF format)\n");
         reset_exit();
     }
@@ -220 +220 @@
 }
 
+/**
+ * \param buffer : Pointer to the char buffer
+ *
+ * \brief Print a 512 bytes buffer
+ */
+#if (RESET_DEBUG == 1 )
+void reset_display_block( char* buffer )
+{
+    unsigned int line;
+    unsigned int word;
+
+    reset_puts("***********************************************************************\n");
+    for ( line = 0 ; line < 32 ; line++ )
+    {
+        // display line index 
+        reset_putx( line );
+        reset_puts(" : ");
+
+        // display 8*4 bytes hexa
+        for ( word=0 ; word<4 ; word++ )
+        {
+            unsigned int byte  = (line<<5) + (word<<2);
+            unsigned int hexa  = (buffer[byte  ]<<24) |
+                                 (buffer[byte+1]<<16) |
+                                 (buffer[byte+2]<< 8) |
+                                 (buffer[byte+3]);
+            reset_putx( hexa );
+            reset_puts(" | ");
+        }
+        reset_puts("\n");
+    }
+    reset_puts("***********************************************************************\n");
+}   
+#endif
+
 /*
  * vim: tabstop=4 : softtabstop=4 : shiftwidth=4 : expandtab