Changes in kernel/arch/ia32/src/ia32.c [2a103b5:3daba42e] in mainline

File:

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

kernel/arch/ia32/src/ia32.c

@@ -58 +58 @@
 #include <genarch/multiboot/multiboot.h>
 #include <genarch/multiboot/multiboot2.h>
-#include <genarch/pic/pic_ops.h>
 #include <arch/pm.h>
 #include <arch/vreg.h>
@@ -113 +112 @@
                     (i8259_t *) I8259_PIC1_BASE, IVT_IRQBASE);
 
-                /* Set PIC operations. */
-                pic_ops = &i8259_pic_ops;
+                /*
+                 * Set the enable/disable IRQs handlers.
+                 * Set the End-of-Interrupt handler.
+                 */
+                enable_irqs_function = pic_enable_irqs;
+                disable_irqs_function = pic_disable_irqs;
+                eoi_function = pic_eoi;
+                irqs_info = "i8259";
         }
 }
@@ -189 +194 @@
                         indev_t *kbrd = kbrd_wire(kbrd_instance, sink);
                         i8042_wire(i8042_instance, kbrd);
-                        pic_ops->enable_irqs(1 << IRQ_KBD);
-                        pic_ops->enable_irqs(1 << IRQ_MOUSE);
+                        trap_virtual_enable_irqs(1 << IRQ_KBD);
+                        trap_virtual_enable_irqs(1 << IRQ_MOUSE);
                 }
         }
@@ -215 +220 @@
                         indev_t *srln = srln_wire(srln_instance, sink);
                         ns16550_wire(ns16550_instance, srln);
-                        pic_ops->enable_irqs(1 << IRQ_NS16550);
+                        trap_virtual_enable_irqs(1 << IRQ_NS16550);
                 }
 #endif
@@ -226 +231 @@
 #endif
 
-        sysinfo_set_item_val(pic_ops->get_name(), NULL, true);
+        if (irqs_info != NULL)
+                sysinfo_set_item_val(irqs_info, NULL, true);
 }