Changeset 6 for trunk/tools/bootloader_tsar/boot_fat32.c

Timestamp:

Apr 26, 2017, 2:14:33 PM (7 years ago)

Author:

alain

Message:

Modify the boot_info_t struct to describe external peripherals in all clusters.

File:

• trunk/tools/bootloader_tsar/boot_fat32.c (modified) (19 diffs)

trunk/tools/bootloader_tsar/boot_fat32.c

@@ -148 +148 @@
 {
 #if DEBUG_BOOT_FAT32    
-    boot_printf("\n[BOOT] %s: Enters at cycle %d\n",
+    boot_printf("\n[BOOT INFO] %s enters at cycle %d\n",
                 __FUNCTION__ , boot_get_proctime() );
 #endif
@@ -163 +163 @@
 
 #if DEBUG_BOOT_FAT32    
-    boot_printf("\n[BOOT] %s: FSI Sector loaded at cycle %d\n",
+    boot_printf("\n[BOOT INFO] %s : FSI Sector loaded at cycle %d\n",
                 __FUNCTION__ , boot_get_proctime() );
 #endif
@@ -197 +197 @@
 
 #if DEBUG_BOOT_FAT32    
-    boot_printf("\n[BOOT] %s: free_clusters_nr = %x / free_cluster_hint = %x\n",
+    boot_printf("\n[BOOT INFO] %s : free_clusters_nr = %x / free_cluster_hint = %x\n",
                 __FUNCTION__ , boot_fat.free_clusters_nr , boot_fat.free_cluster_hint );
 #endif
@@ -430 +430 @@
 
 #if DEBUG_BOOT_FAT32    
-    boot_printf("\n[BOOT] %s: returns <%s> from <%s> at cycle %d\n",
+    boot_printf("\n[BOOT INFO] %s : returns <%s> from <%s> at cycle %d\n",
                 __FUNCTION__ , path_component , pathname , boot_get_proctime() );
 #endif
@@ -592 +592 @@
 
 #if DEBUG_BOOT_FAT32    
-    boot_printf("\n[BOOT] %s: Enters for <%s> file at cycle %d\n",
+    boot_printf("\n[BOOT INFO] %s enters for <%s> file at cycle %d\n",
                 __FUNCTION__ , pathname, boot_get_proctime());
 #endif
@@ -615 +615 @@
         while ( found == 0 )
         {
-
-boot_printf("\n!!! enter second while for <%s> path_comp\n", path_comp );
-
             cluster_lba = cluster_to_lba( parent_cluster );
             
@@ -646 +643 @@
                 if (ord == LAST_ENTRY)             // no more entry in this directory
                 {
-
-boot_printf("\n@@@ for <%s> component / offset = %d : last entry\n", path_comp , offset );
-
                     found = 2;
                 }
@@ -654 +648 @@
                 else if (ord == FREE_ENTRY)        // unused, check the next entry
                 {
-
-boot_printf("\n@@@ for <%s> component / offset = %d : free entry\n", path_comp , offset );
-
                     continue;
                 }
@@ -672 +663 @@
                     get_name_from_long(entry, buffer_lfn);
 
-boot_printf("\n@@@ for <%s> component / offset = %d : LFN entry = %s\n", 
-            path_comp , offset , buffer_lfn );
-
                     // Append this portion of the name to the full name buffer
                     boot_strcpy(name + 13 * (lfn_seq_order-1) , buffer_lfn);
@@ -685 +673 @@
                 {
                     if (lfn_seq_elem_nr == 0) get_name_from_short(entry, name);
-
-boot_printf("\n@@@ for <%s> component / offset = %d : SFN entry = %s\n", 
-            path_comp , offset , name );
 
                     // check if the full name is what we are looking for.
@@ -725 +710 @@
         } // end second while for one component in pathname
         
-boot_printf("\n### exit hwile fpr component <%s>\n", path_comp );
-
         // Check the result of this path component search.
         if (found == 2)
@@ -755 +738 @@
 
 #if DEBUG_BOOT_FAT32    
-    boot_printf("\n[BOOT] fat_file_search(): "
-                "<%s> file of size %x found at cluster %x at cycle %d\n",
-                pathname, *file_size, *first_cluster, boot_get_proctime());
+    boot_printf("\n[BOOT INFO] %s : <%s> file found at cycle %d\n"
+                "    fat_cluster = %x / size = %x\n",
+                __FUNCTION__ , pathname , boot_get_proctime() , *first_cluster , *file_size );
 #endif
 
@@ -771 +754 @@
 int boot_fat32_init()
 {
-
-boot_printf("@@@ BEFORE_VALUE = %x\n", FAT_MAGIC_VALUE);
-
     // FAT32 initialization should be done only once
     if (boot_fat.initialized == FAT_MAGIC_VALUE)
@@ -783 +763 @@
 
 #if DEBUG_BOOT_FAT32    
-boot_printf("\n[BOOT] %s: Enters at cycle %d\n",
+boot_printf("\n[BOOT INFO] %s: Enters at cycle %d\n",
             __FUNCTION__ , boot_get_proctime() );
 #endif
@@ -799 +779 @@
 
 #if DEBUG_BOOT_FAT32    
-boot_printf("\n[BOOT] %s: Boot Sector loaded at cycle %d\n",
+boot_printf("\n[BOOT INFO] %s: Boot Sector loaded at cycle %d\n",
             __FUNCTION__ , boot_get_proctime() );
-// unsigned char * data = boot_fat.block_buffer;
-// uint32_t   byte;
-// for( byte = 0 ; byte < 16 ; byte++ ) boot_printf("%d : %x\n", byte , data[byte] );
 #endif
 
@@ -865 +842 @@
     boot_fat.initialized    = FAT_MAGIC_VALUE;
 
-boot_printf("@@@ AFTER_VALUE = %x\n", FAT_MAGIC_VALUE);
-
-fat32_desc_display();
-    
     // Set information from FS Information Sector
     if (set_fsi()) return -1;
@@ -878 +851 @@
 #if DEBUG_BOOT_FAT32    
     fat32_desc_display();
-    boot_printf("\n[BOOT] boot_fat32_init(): FAT32 File System initialized at cycle %d\n",
-                boot_get_proctime());
+    boot_printf("\n[BOOT INFO] %s : FAT32 File System initialized at cycle %d\n",
+                __FUNCTION__ , boot_get_proctime() );
 #endif
 
@@ -907 +880 @@
 
 #if DEBUG_BOOT_FAT32    
-    boot_printf("\n[BOOT] %s: Enters for file <%s> at cycle %d\n",
+    boot_printf("\n[BOOT INFO] %s enters for file <%s> at cycle %d\n",
                 __FUNCTION__ , pathname, boot_get_proctime() );
 #endif
@@ -973 +946 @@
 
 #if DEBUG_BOOT_FAT32    
-    boot_printf("\n[BOOT] boot_fat32_load(): "
-                "File <%s> of size %x loaded at address %x at cycle %d\n",
-                pathname, size, buff_addr, boot_get_proctime());
+    boot_printf("\n[BOOT INFO] %s : file <%s> loaded at cycle %d\n"
+                "    address = %x , size = %x\n",
+                __FUNCTION__ , pathname , boot_get_proctime() , buff_addr , size );
 #endif