Changeset 697 for soft/giet_vm/giet_kernel/irq_handler.c

Timestamp:

Aug 7, 2015, 5:42:06 PM (9 years ago)

Author:

guerin

Message:

kernel: release WTI mailbox associated with TTY

We don't block on giet_tty_alloc() anymore when launching the same app
again and again.

File:

• soft/giet_vm/giet_kernel/irq_handler.c (modified) (3 diffs)

soft/giet_vm/giet_kernel/irq_handler.c

@@ -206 +206 @@
 ////////////////////////////////////////////
 void _ext_irq_release( unsigned int isr_type,
-                       unsigned int isr_channel,
-                       unsigned int wti_index )
-{
+                       unsigned int isr_channel )
+{
+    unsigned int wti_id;        // allocated WTI mailbox index in XCU
     unsigned int irq_id;        // external IRQ index in PIC (input)
 
@@ -230 +230 @@
     }
 
+    // find WTI index
+    static_scheduler_t*  psched = (static_scheduler_t*)_get_sched();
+    for ( wti_id = 0 ; wti_id < 32 ; wti_id++ )
+    {
+        if ( psched->wti_vector[wti_id] == (isr_channel<<16 | isr_type) )
+            break;
+    }
+    if ( wti_id == 32 )
+    {
+        _printf("\n[GIET ERROR] in _ext_irq_release() : isr not found\n");
+        return;
+    }
+
     // desactivates dynamically allocated PIC entry
     irq_id = _ext_irq_index[isr_type][isr_channel];
@@ -235 +248 @@
 
     // releases dynamically allocated WTI mailbox
-    if      ( wti_index == p +   NB_PROCS_MAX ) _wti_alloc_one[x][y][p] = 0;
-    else if ( wti_index == p + 2*NB_PROCS_MAX ) _wti_alloc_two[x][y][p] = 0;
-    else if ( wti_index == p + 3*NB_PROCS_MAX ) _wti_alloc_ter[x][y][p] = 0;
+    if      ( wti_id == p +   NB_PROCS_MAX ) _wti_alloc_one[x][y][p] = 0;
+    else if ( wti_id == p + 2*NB_PROCS_MAX ) _wti_alloc_two[x][y][p] = 0;
+    else if ( wti_id == p + 3*NB_PROCS_MAX ) _wti_alloc_ter[x][y][p] = 0;
     else
     {