Changes in kernel/arch/ia32/src/ia32.c [2a103b5:3daba42e] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/arch/ia32/src/ia32.c
r2a103b5 r3daba42e 58 58 #include <genarch/multiboot/multiboot.h> 59 59 #include <genarch/multiboot/multiboot2.h> 60 #include <genarch/pic/pic_ops.h>61 60 #include <arch/pm.h> 62 61 #include <arch/vreg.h> … … 113 112 (i8259_t *) I8259_PIC1_BASE, IVT_IRQBASE); 114 113 115 /* Set PIC operations. */ 116 pic_ops = &i8259_pic_ops; 114 /* 115 * Set the enable/disable IRQs handlers. 116 * Set the End-of-Interrupt handler. 117 */ 118 enable_irqs_function = pic_enable_irqs; 119 disable_irqs_function = pic_disable_irqs; 120 eoi_function = pic_eoi; 121 irqs_info = "i8259"; 117 122 } 118 123 } … … 189 194 indev_t *kbrd = kbrd_wire(kbrd_instance, sink); 190 195 i8042_wire(i8042_instance, kbrd); 191 pic_ops->enable_irqs(1 << IRQ_KBD);192 pic_ops->enable_irqs(1 << IRQ_MOUSE);196 trap_virtual_enable_irqs(1 << IRQ_KBD); 197 trap_virtual_enable_irqs(1 << IRQ_MOUSE); 193 198 } 194 199 } … … 215 220 indev_t *srln = srln_wire(srln_instance, sink); 216 221 ns16550_wire(ns16550_instance, srln); 217 pic_ops->enable_irqs(1 << IRQ_NS16550);222 trap_virtual_enable_irqs(1 << IRQ_NS16550); 218 223 } 219 224 #endif … … 226 231 #endif 227 232 228 sysinfo_set_item_val(pic_ops->get_name(), NULL, true); 233 if (irqs_info != NULL) 234 sysinfo_set_item_val(irqs_info, NULL, true); 229 235 } 230 236
Note:
See TracChangeset
for help on using the changeset viewer.