Changeset 3e828ea in mainline for kernel/arch/amd64/src/amd64.c

Timestamp:

2019-09-23T12:49:29Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (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.

git-author:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

File:

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

kernel/arch/amd64/src/amd64.c

@@ -60 +60 @@
 #include <arch/vreg.h>
 #include <arch/kseg.h>
+#include <genarch/pic/pic_ops.h>
 
 #ifdef CONFIG_SMP
@@ -121 +122 @@
                 /* PIC */
                 i8259_init((i8259_t *) I8259_PIC0_BASE,
-                    (i8259_t *) I8259_PIC1_BASE, IRQ_PIC1, IVT_IRQBASE,
-                    IVT_IRQBASE + 8);
-
-                /*
-                 * 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";
+                    (i8259_t *) I8259_PIC1_BASE, IVT_IRQBASE);
+
+                /* Set PIC operations. */
+                pic_ops = &i8259_pic_ops;
         }
 }
@@ -210 +204 @@
                         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);
                 }
         }
@@ -236 +230 @@
                         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
@@ -247 +241 @@
 #endif
 
-        if (irqs_info != NULL)
-                sysinfo_set_item_val(irqs_info, NULL, true);
+        sysinfo_set_item_val(pic_ops->get_name(), NULL, true);
 }