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

Timestamp:

Mar 5, 2013, 1:42:57 PM (12 years ago)

Author:

joannou

Message:

• Bugfix in Interruption mechanism :
  • _it_mask() and _it_restore() functions now share a global array indexed by the proc_id (used a simple global variable before => problem with multiproc)
  • added 2 new fuctions _it_enable() and _it_disable() that only affect the IE bit of the status register in COP0
  • replaced interrupt masking/restoring arround _ctx_switch() in sys_handler by a simple interrupt disabling before the call to _ctx_switch (restoring after a _ctx_switch wouldn't restore the correct task's status register)
  • replaced the use of _ctx_switch in _exit() by a call to _context_switch() (this function actually does the interrupt disabling)
• Added some comments in the ctx_handler.h
• Added the delay reset in the idle task (ctx_handler.c)
• Added a new irq type (PTI)
  • Modifications in xml_parser.c to accept PTI irq type (now used in xml mappings)
  • Added the test on the irq type in the _irq_demux() function. This leads to a different argument passed to the ISR (i.e. either channel_id or irq_id (aka icuid) )

File:

• soft/giet_vm/sys/irq_handler.c (modified) (1 diff)

soft/giet_vm/sys/irq_handler.c

@@ -57 +57 @@
         unsigned int entry = _get_interrupt_vector_entry(irq_id);
         unsigned int isr_id = entry & 0x000000FF;
+        unsigned int type_id = (entry >> 8) & 0x000000FF;
         unsigned int channel_id = (entry >> 16) & 0x0000FFFF;
-        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);
-        else if ( isr_id == ISR_TTY   ) _isr_tty(channel_id);
-        else if ( isr_id == ISR_TIMER ) _isr_timer(channel_id);
-        else                            _isr_default();
+        if(type_id == 0) // HARD irq type
+        {
+            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);
+            else if ( isr_id == ISR_TTY   ) _isr_tty(channel_id);
+            else if ( isr_id == ISR_TIMER ) _isr_timer(channel_id);
+            else                            _isr_default();
+        }
+        else // PTI irq type
+        {
+            if      ( isr_id == ISR_SWITCH) _isr_switch(irq_id);
+            else if ( isr_id == ISR_TIMER ) _isr_timer(irq_id);
+        }
     }
 }