Changes in kernel/arch/ia32/src/interrupt.c [2a103b5:fd67c9f] in mainline

File:

• kernel/arch/ia32/src/interrupt.c (modified) (8 diffs)

kernel/arch/ia32/src/interrupt.c

@@ -40 +40 @@
 #include <panic.h>
 #include <genarch/drivers/i8259/i8259.h>
-#include <genarch/pic/pic_ops.h>
 #include <halt.h>
 #include <cpu.h>
@@ -62 +61 @@
  */
 
-pic_ops_t *pic_ops = NULL;
+void (*disable_irqs_function)(uint16_t irqmask) = NULL;
+void (*enable_irqs_function)(uint16_t irqmask) = NULL;
+void (*eoi_function)(unsigned int) = NULL;
+const char *irqs_info = NULL;
 
 void istate_decode(istate_t *istate)
@@ -86 +88 @@
             istate_from_uspace(istate) ? istate->esp :
             (uint32_t) &istate->esp);
+}
+
+static void trap_virtual_eoi(unsigned int inum)
+{
+        if (eoi_function)
+                eoi_function(inum);
+        else
+                panic("No eoi_function.");
+
 }
 
@@ -168 +179 @@
     istate_t *istate __attribute__((unused)))
 {
-        pic_ops->eoi(0);
+        trap_virtual_eoi(0);
         tlb_shootdown_ipi_recv();
 }
@@ -191 +202 @@
                 if (irq->preack) {
                         /* Send EOI before processing the interrupt */
-                        pic_ops->eoi(inum);
+                        trap_virtual_eoi(inum);
                         ack = true;
                 }
@@ -204 +215 @@
 
         if (!ack)
-                pic_ops->eoi(inum);
+                trap_virtual_eoi(inum);
 }
 
@@ -210 +221 @@
 {
         unsigned int inum = n - IVT_IRQBASE;
-        if (!pic_ops->is_spurious(inum)) {
+        if (!pic_is_spurious(inum)) {
                 /* This is actually not a spurious IRQ, so proceed as usual. */
                 irq_interrupt(n, istate);
                 return;
         }
-        pic_ops->handle_spurious(n);
+        pic_handle_spurious(n);
 #ifdef CONFIG_DEBUG
         log(LF_ARCH, LVL_DEBUG, "cpu%u: PIC spurious interrupt %u", CPU->id,
@@ -253 +264 @@
 }
 
+void trap_virtual_enable_irqs(uint16_t irqmask)
+{
+        if (enable_irqs_function)
+                enable_irqs_function(irqmask);
+        else
+                panic("No enable_irqs_function.");
+}
+
+void trap_virtual_disable_irqs(uint16_t irqmask)
+{
+        if (disable_irqs_function)
+                disable_irqs_function(irqmask);
+        else
+                panic("No disable_irqs_function.");
+}
+
 /** @}
  */