Changeset 388 for trunk/softs/tsar_boot/src/boot_elf_loader.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_elf_loader.c (modified) (3 diffs)

trunk/softs/tsar_boot/src/boot_elf_loader.c

@@ -73 +73 @@
             {
                 boot_puts (
-                                        "ERROR: "
-                                        "IOC_FAILED"
-                                        "\n"
-                                );
+                    "ERROR: "
+                    "IOC_FAILED"
+                    "\n"
+                );
 
                 boot_exit();
             }
-           
+
             nb_block    += 1;
             nb_available = 512;
@@ -102 +102 @@
                     nb_rest = elf_header_ptr->e_phnum * elf_header_ptr->e_phentsize;
 
-                                        /* Verification of ELF Magic Number */
-                                        if (
-                                                (elf_header_ptr->e_ident[EI_MAG0] != ELFMAG0) ||
-                                                (elf_header_ptr->e_ident[EI_MAG1] != ELFMAG1) ||
-                                                (elf_header_ptr->e_ident[EI_MAG2] != ELFMAG2) ||
-                                                (elf_header_ptr->e_ident[EI_MAG3] != ELFMAG3) )
-                                        {
-                                                boot_puts(
-                                                        "ERROR: "
-                                                        "Input file does not use ELF format"
-                                                        "\n"
-                                                );      
-
-                                                boot_exit();
-                                        }
-
-                                        /* 
-                                         * Verification of Program Headers table size. It must be
-                                         * smaller than the work size allocated for the 
-                                         * elf_pht[PHDR_ARRAY_SIZE] array
-                                         **/
+                    /* Verification of ELF Magic Number */
+                    if (
+                        (elf_header_ptr->e_ident[EI_MAG0] != ELFMAG0) ||
+                        (elf_header_ptr->e_ident[EI_MAG1] != ELFMAG1) ||
+                        (elf_header_ptr->e_ident[EI_MAG2] != ELFMAG2) ||
+                        (elf_header_ptr->e_ident[EI_MAG3] != ELFMAG3) )
+                    {
+                        boot_puts(
+                            "ERROR: "
+                            "Input file does not use ELF format"
+                            "\n"
+                        );  
+
+                        boot_exit();
+                    }
+
+                    /* 
+                     * Verification of Program Headers table size. It must be
+                     * smaller than the work size allocated for the 
+                     * elf_pht[PHDR_ARRAY_SIZE] array
+                     **/
                     if (elf_header_ptr->e_phnum > PHDR_ARRAY_SIZE)
                     {
                         boot_puts(
-                                                        "ERROR: "
-                                                        "ELF PHDR table size is bigger than "
-                                                        "the allocated work space"
-                                                        "\n"
-                                                );
+                            "ERROR: "
+                            "ELF PHDR table size is bigger than "
+                            "the allocated work space"
+                            "\n"
+                        );
 
                         boot_exit();
@@ -257 +257 @@
 
     boot_puts (
-                "Finishing boot_elf_loader function.\n"
-                "Entry point address: "
-        );
+        "Finishing boot_elf_loader function.\n"
+        "Entry point address: "
+    );
     boot_putx(elf_header_ptr->e_entry);
     boot_puts("\n");