Changeset 283 for branch/giet_vm_ioc_drivers/giet_boot/boot.c

Timestamp:

Jan 31, 2014, 11:35:57 AM (10 years ago)

Author:

cfuguet

Message:

Introducing branch to test ioc drivers before merging on trunk

Location:

branch

Files:

• . (added)
• giet_vm_ioc_drivers (copied) (copied from soft/giet_vm)
• giet_vm_ioc_drivers/giet_boot/boot.c (modified) (3 diffs)

branch/giet_vm_ioc_drivers/giet_boot/boot.c

@@ -1561 +1561 @@
 void boot_mapping_init()
 {
-    // Initializing the FAT descriptor and files descriptor array
-    if ( _fat_init( IOC_BOOT_PA_MODE ) )   
-    {
-        _puts("[BOOT ERROR] Cannot initialize FAT descriptor fom Boot Sector\n");
-        _exit();
-    }
-
-#if BOOT_DEBUG_MAPPING
-_puts("\n[BOOT] FAT initialisation completed at cycle ");
-_putd(_get_proctime());
-_puts("\n");
-_fat_print();
-#endif
+    _ioc_init( 0 );
 
     int fd_id = _fat_open( IOC_BOOT_PA_MODE,
@@ -1927 +1915 @@
                 case PERIPH_TYPE_IOC:    // vci_block_device component
                 {
-                    _ioc_init();
+                    // initialize all channels except channel 0 because it has been
+                    // initialize during mapping_info loading
+                    for (channel_id = 1; channel_id < channels; channel_id++) 
+                    {
+                        _ioc_init( channel_id );
+                    }
 #if BOOT_DEBUG_PERI
 _puts("- IOC / channels = ");
@@ -1953 +1946 @@
 #if BOOT_DEBUG_PERI
 _puts("- FBF / channels = ");
-_putd(channels);
-_puts("\n");
-#endif
-                    break;
-                }
-                case PERIPH_TYPE_HBA:    // vci_multi_ahci component
-                {
-                    for (channel_id = 0; channel_id < channels; channel_id++) 
-                    {
-                        // TODO
-                    }
-#if BOOT_DEBUG_PERI
-_puts("- HBA / channels = ");
 _putd(channels);
 _puts("\n");