Changeset 203 for soft/giet_vm/boot/boot_init.c

Timestamp:

Aug 13, 2012, 10:52:25 PM (12 years ago)

Author:

alain

Message:

Introducing support for XICU

File:

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

soft/giet_vm/boot/boot_init.c

@@ -800 +800 @@
     }
 
-    // checking Rnumber of clusters
+    // checking number of clusters
     if ( header->clusters != NB_CLUSTERS )
     {
@@ -820 +820 @@
     }
 
-    // checking harware
+    // checking hardware
     unsigned int periph_id;
     unsigned int cluster_id;
@@ -851 +851 @@
                     boot_exit();
                 }
-                if ( periph[periph_id].channels > NB_TTYS )
-                {
-                    boot_puts("\n[BOOT ERROR] Too much TTY terminals in cluster ");
+                if ( periph[periph_id].channels != NB_TTYS )
+                {
+                    boot_puts("\n[BOOT ERROR] Wrong NB_TTYS in cluster ");
                     boot_putw( cluster_id );
                     boot_puts(" : ttys = ");
@@ -870 +870 @@
                     boot_exit();
                 }
-                if ( periph[periph_id].channels > NB_NICS )
-                {
-                    boot_puts("\n[BOOT ERROR] Too much NIC channels in cluster ");
+                if ( periph[periph_id].channels != NB_NICS )
+                {
+                    boot_puts("\n[BOOT ERROR] Wrong NB_NICS in cluster ");
                     boot_putw( cluster_id );
                     boot_puts(" : nics = ");
@@ -884 +884 @@
             if ( periph[periph_id].type == PERIPH_TYPE_TIM ) 
             {
-                if ( periph[periph_id].channels > NB_TIMERS_MAX )
+                if ( periph[periph_id].channels != (NB_PROCS_MAX + NB_TIMERS_MAX) )
                 {
                     boot_puts("\n[BOOT ERROR] Too much user timers in cluster ");
@@ -897 +897 @@
             if ( periph[periph_id].type == PERIPH_TYPE_DMA ) 
             {
-                if ( periph[periph_id].channels > NB_DMAS_MAX )
+                if ( periph[periph_id].channels != NB_DMAS_MAX )
                 {
                     boot_puts("\n[BOOT ERROR] Too much DMA channels in cluster ");
@@ -1198 +1198 @@
 ////////////////////////////////////////////////////////////////////////////////
 // This function intializes the periherals and coprocessors, as specified
-// tsuch as the IOB component
-// (I/O bridge, containing the IOMMU, the IOC (external disk controller), 
-// the NIC (external network controller), the FBDMA (frame buffer controller), 
+// in the mapping_info file.
 ////////////////////////////////////////////////////////////////////////////////
 void boot_peripherals_init()
@@ -1306 +1304 @@
 
         } // end for periphs
-
+/*
         for ( coproc_id = cluster[cluster_id].coproc_offset ;
               coproc_id < cluster[cluster_id].coproc_offset + cluster[cluster_id].coprocs ;
@@ -1358 +1356 @@
             }
         } // end for coprocs
-
+*/
     } // end for clusters
 } // end boot_peripherals_init()