Changeset 215 for soft/giet_vm/sys/kernel_init.c

Timestamp:

Sep 17, 2012, 10:47:46 AM (12 years ago)

Author:

karaoui

Message:

New components are now mandotory in the XML description:

• Timer/Icu? or Xicu
• Dma

The files giet_vsegs.ld and hard_config.h are now autogenerated by the xml2bin tool.

File:

• soft/giet_vm/sys/kernel_init.c (modified) (4 diffs)

soft/giet_vm/sys/kernel_init.c

@@ -48 +48 @@
 unsigned int                    _idle_stack[NB_CLUSTERS*NB_PROCS_MAX*64]; 
 
+void _sys_exit()
+{
+    while(1);
+}
+
 //////////////////////////////////////////////////////////////////////////////////
 // This function is the entry point for the last step of the boot sequence.
@@ -127 +132 @@
     unsigned int pti_mask = 0;
 
+    unsigned int isr_switch_channel = 0xFFFFFFFF;
+
     for ( irq_id = 0 ; irq_id < 32 ; irq_id++ )
     {
@@ -136 +143 @@
              hwi_mask = hwi_mask | 0x1<< irq_id;
         }
-        else if ( (isr == ISR_SWITCH) || (isr == ISR_TIMER) )
+        else if ( (isr == ISR_SWITCH) )
         { 
+            pti_mask = pti_mask | 0x1<< irq_id;
+            isr_switch_channel = irq_id;
+        }
+        else if ( (isr == ISR_TIMER) )
+        {
             pti_mask = pti_mask | 0x1<< irq_id;
         }
@@ -159 +171 @@
     if ( tasks > 1 )
     {
+        if(isr_switch_channel == 0xFFFFFFFF)
+        {
+            _puts("\n[GIET ERROR] ISR_SWITCH not found on proc ");
+            _putd( proc_id);
+            _puts("\n");
+            _sys_exit();
+        }
         _timer_start( cluster_id, 
-                      proc_id, 
+                      isr_switch_channel, 
                       GIET_TICK_VALUE );