Changeset 411b6a6 in mainline for kernel/arch/ia64/src

Timestamp:

2009-03-07T16:08:40Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4c84368e

Parents:

e06da7e

Message:

Complete emancipation of kernel serial controller drivers (i8042, ns16550 and
z8530). Provide a common keyboard module for PC and Sun keyboards. The serial
line module is still to follow.

Location:

kernel/arch/ia64/src

Files:

• ia64.c (modified) (2 diffs)
• smp/smp.c (modified) (1 diff)

kernel/arch/ia64/src/ia64.c

@@ -55 +55 @@
 #include <genarch/drivers/legacy/ia32/io.h>
 #include <genarch/drivers/ega/ega.h>
-#include <genarch/kbd/i8042.h>
+#include <genarch/kbrd/kbrd.h>
+#include <genarch/drivers/i8042/i8042.h>
 #include <genarch/kbd/ns16550.h>
 #include <smp/smp.h>
@@ -178 +179 @@
 #else
         inr = IRQ_KBD;
-        (void) i8042_init((i8042_t *)I8042_BASE, devno, inr);
+        kbrd_init(stdin);
+        (void) i8042_init((i8042_t *)I8042_BASE, devno, inr, &kbrdin);
+        trap_virtual_enable_irqs(1 << inr);
         sysinfo_set_item_val("kbd.type", NULL, KBD_LEGACY);
         sysinfo_set_item_val("kbd.address.physical", NULL,

kernel/arch/ia64/src/smp/smp.c

@@ -53 +53 @@
 #include <ddi/device.h>
 #include <arch/bootinfo.h>
-#include <genarch/kbd/i8042.h>
-#include <genarch/kbd/ns16550.h>
 #include <smp/smp.h>
 #include <smp/ipi.h>