Changeset 289 for soft/giet_vm/giet_boot/boot.c

Timestamp:

Feb 4, 2014, 2:16:37 AM (11 years ago)

Author:

cfuguet

Message:

Modifications on GIET-VM IOC driver:

• Introducing new layer on the IOC driver. Every call to ioc_read, ioc_write, ioc_get_block_size or ioc_init

functions will call the specific driver of the used IOC
controller. Supported IOC controllers are (for now) :

1. BDV (Soclib Block Device)
2. HBA
3. SPI (SDCARD - SPI controller)

• All functions of IOC controllers drivers respect the same interface.

• To specify the used IOC controller of the platform, a subtype field has been introduced on the map.xml file. This subtype field must be declared on the IOC periph instantiation. Available subtypes (for now) : BDV, HBA or SPI.

File:

• soft/giet_vm/giet_boot/boot.c (modified) (6 diffs)

soft/giet_vm/giet_boot/boot.c

@@ -1169 +1169 @@
     unsigned int alloc_tim_channel[X_SIZE*Y_SIZE]; // user TIMER allocators
 
-    if (!GIET_MONO_TTY) alloc_tty_channel++;
+    if (NB_TTY_CHANNELS > 1) alloc_tty_channel++;
 
     /////////////////////////////////////////////////////////////////////////
@@ -1372 +1372 @@
                 }
                 ctx_tty = alloc_tty_channel;
-                if (!GIET_MONO_TTY) alloc_tty_channel++;
+                if (NB_TTY_CHANNELS > 1) alloc_tty_channel++;
             }
             // ctx_nic : NIC channel global index provided by the global allocator
@@ -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,
@@ -1746 +1734 @@
             {
                 unsigned int i; 
-                for( i = seg_filesz ; i < seg_memsz; i++ ) boot_buffer[i] = 0;
+                for( i = seg_filesz ; i < seg_memsz ; i++ ) boot_buffer[i+seg_offset] = 0;
             } 
 
@@ -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");