Changeset 216 for soft/giet_vm/sys/irq_handler.c

Timestamp:

Sep 18, 2012, 6:38:49 PM (12 years ago)

Author:

karaoui

Message:

• updating irq_handler.c/drivers.c to support the nex affectations of timers
• When using an xicu the number of timer is set to 32

File:

• soft/giet_vm/sys/irq_handler.c (modified) (5 diffs)

soft/giet_vm/sys/irq_handler.c

@@ -45 +45 @@
     unsigned int        irq_id;
 
+
     // get the highest priority active IRQ index 
     if ( _icu_get_index( pid / NB_PROCS_MAX,
@@ -55 +56 @@
     }
 
+
     if ( irq_id < 32 )  // do nothing if no interrupt active 
     {
@@ -60 +62 @@
         unsigned int isr_id     = entry & 0x000000FF;
         unsigned int channel_id = (entry>>16) & 0x0000FFFF;
-        if      ( isr_id == ISR_SWITCH  ) _isr_switch();
+        if      ( isr_id == ISR_SWITCH  ) _isr_switch( channel_id );
         else if ( isr_id == ISR_IOC     ) _isr_ioc();
         else if ( isr_id == ISR_DMA     ) _isr_dma( channel_id );
@@ -169 +171 @@
     // aknowledge IRQ 
     if ( _timer_reset_irq( cluster_id, 
-                           NB_PROCS_MAX + timer_id ) )
+                           timer_id ) )
     {
         _get_lock(&_tty_put_lock);
@@ -230 +232 @@
 // The ISR acknowledges the IRQ and calls the _ctx_switch() function.
 /////////////////////////////////////////////////////////////////////////////////////
-void _isr_switch()
+void _isr_switch( unsigned int timer_id)
 {
     // get cluster index and proc local index
-    unsigned int pid        = _procid();
-    unsigned int local_id   = pid % NB_PROCS_MAX;
-    unsigned int cluster_id = pid / NB_PROCS_MAX;
+    unsigned int cluster_id = _procid() / NB_PROCS_MAX;
 
     // acknowledge IRQ
-    if ( _timer_reset_irq( cluster_id, local_id ) ) 
+    if ( _timer_reset_irq( cluster_id, timer_id ) ) 
     {
         _get_lock(&_tty_put_lock);