Changeset 460

Timestamp:

Dec 5, 2014, 3:53:36 PM (9 years ago)

Author:

alain

Message:

Introducing an explicit FAT initialisation in boot.c.

File:

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

soft/giet_vm/giet_boot/boot.c

@@ -70 +70 @@
 #include <xcu_driver.h>
 #include <bdv_driver.h>
+#include <hba_driver.h>
 #include <dma_driver.h>
 #include <cma_driver.h>
@@ -82 +83 @@
 #include <pmem.h>
 #include <utils.h>
+#include <tty0.h>
 #include <elf-types.h>
 
@@ -1338 +1340 @@
                     _exit();
                 }
-            }
+            } // end while
 
             unsigned int type    = irq[irq_id].srctype;
@@ -1360 +1362 @@
             unsigned int index            = alloc_wti_channel[cluster_id];
             psched->wti_vector[index]     = isr | channel | 0x80000000;
+
+            // increment pointers
             alloc_wti_channel[cluster_id] = index + 1;
             lpid                          = lpid + 1;
@@ -1670 +1674 @@
     if ( fat.fd[fd_id].file_size > GIET_ELF_BUFFER_SIZE )
     {
-        _puts("\n[BOOT ERROR] load_one_elf_file() : ");
+        _puts("\n[BOOT ERROR] in load_one_elf_file() : ");
         _puts( pathname );
-        _puts(" exceeds the GIET_ELF_BUFFERSIZE defined in giet_config.h\n");
+        _puts(" size = ");
+        _putx( fat.fd[fd_id].file_size );
+        _puts("\n exceeds the GIET_ELF_BUFFERSIZE = ");
+        _putx( GIET_ELF_BUFFER_SIZE );
+        _puts("\n");
         _exit();
     }
@@ -1986 +1994 @@
                     if ( subtype == PERIPH_SUBTYPE_BDV )
                     {
-                        _bdv_lock.value = 0;
-#if BOOT_DEBUG_PERI
-_puts("- BDV : channels = ");
-_putd(channels);
-_puts("\n");
-#endif
+                        _bdv_init();
                     }
-                    else if ( subtype == PERIPH_SUBTYPE_HBA )
+                    else if ( subtype == PERIPH_SUBTYPE_HBA ) 
                     {
-                        // TODO
+                        for (channel_id = 0; channel_id < channels; channel_id++) 
+                            _hba_init( channel_id );
                     }
-                    else if ( subtype == PERIPH_SUBTYPE_SPI )
+                    else if ( subtype == PERIPH_SUBTYPE_SPI ) 
                     {
-                        // TODO
+                        //TODO
                     }
-                    break;
-                }
-                case PERIPH_TYPE_CMA:    // vci_chbuf_dma component
-                {
-                    for (channel_id = 0; channel_id < channels; channel_id++) 
-                    {
-                        // TODO
-                    }
-#if BOOT_DEBUG_PERI
-_puts("- CMA : channels = ");
-_putd(channels);
-_puts("\n");
-#endif
-                    break;
-                }
-                case PERIPH_TYPE_NIC:    // vci_multi_nic component
-                {
-                    for (channel_id = 0; channel_id < channels; channel_id++) 
-                    {
-                        // TODO
-                    }
-#if BOOT_DEBUG_PERI
-_puts("- NIC : channels = ");
-_putd(channels);
-_puts("\n");
-#endif
                     break;
                 }
@@ -2033 +2011 @@
                     for (channel_id = 0; channel_id < channels; channel_id++) 
                     {
-                        _tty_lock[channel_id].value = 0;
-                        _tty_rx_full[channel_id]    = 0;
+                        _tty_init( channel_id );
                     }
-#if BOOT_DEBUG_PERI
-_puts("- TTY : channels = ");
-_putd(channels);
-_puts("\n");
-#endif
+                    break;
+                }
+                case PERIPH_TYPE_NIC:    // vci_multi_nic component
+                {
+                    _nic_global_init( 1,      // broadcast accepted
+                                      1,      // bypass activated
+                                      0,      // tdm non activated
+                                      0 );    // tdm period 
                     break;
                 }
@@ -2058 +2038 @@
                 case PERIPH_TYPE_PIC:    // vci_iopic component
                 {
-#if BOOT_DEBUG_PERI
-_puts("- PIC : channels = ");
-_putd(channels);
-_puts("\n");
-#endif
                     // scan all IRQs defined in mapping for PIC component,
                     // and initialises addresses for WTI IRQs
@@ -2224 +2199 @@
         _puts("\n");
 
+        // initialises the FAT
+        _fat_init( IOC_BOOT_MODE );
+
+        _puts("\n[BOOT] Fat initialised at cycle ");
+        _putd(_get_proctime());
+        _puts("\n");
+
         // Load the map.bin file into memory and check it
         boot_mapping_init();