Changeset bc73be3 in mainline for kernel/arch/ia32/src/ia32.c

Timestamp:

2019-06-27T08:51:20Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

cpp: merge and resolve conflicts

File:

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

kernel/arch/ia32/src/ia32.c

@@ -47 +47 @@
 #include <arch/boot/boot.h>
 #include <arch/drivers/i8254.h>
-#include <arch/drivers/i8259.h>
 #include <genarch/acpi/acpi.h>
 #include <genarch/drivers/ega/ega.h>
 #include <genarch/drivers/i8042/i8042.h>
+#include <genarch/drivers/i8259/i8259.h>
 #include <genarch/drivers/ns16550/ns16550.h>
 #include <genarch/drivers/legacy/ia32/io.h>
@@ -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>
@@ -109 +110 @@
 
                 /* PIC */
-                i8259_init();
+                i8259_init((i8259_t *) I8259_PIC0_BASE,
+                    (i8259_t *) I8259_PIC1_BASE, IVT_IRQBASE);
+
+                /* Set PIC operations. */
+                pic_ops = &i8259_pic_ops;
         }
 }
@@ -184 +189 @@
                         indev_t *kbrd = kbrd_wire(kbrd_instance, sink);
                         i8042_wire(i8042_instance, kbrd);
-                        trap_virtual_enable_irqs(1 << IRQ_KBD);
-                        trap_virtual_enable_irqs(1 << IRQ_MOUSE);
+                        pic_ops->enable_irqs(1 << IRQ_KBD);
+                        pic_ops->enable_irqs(1 << IRQ_MOUSE);
                 }
         }
@@ -210 +215 @@
                         indev_t *srln = srln_wire(srln_instance, sink);
                         ns16550_wire(ns16550_instance, srln);
-                        trap_virtual_enable_irqs(1 << IRQ_NS16550);
+                        pic_ops->enable_irqs(1 << IRQ_NS16550);
                 }
 #endif
@@ -221 +226 @@
 #endif
 
-        if (irqs_info != NULL)
-                sysinfo_set_item_val(irqs_info, NULL, true);
+        sysinfo_set_item_val(pic_ops->get_name(), NULL, true);
 }