Changeset 411b6a6 in mainline for kernel/arch/amd64/src/amd64.c

Timestamp:

2009-03-07T16:08:40Z (15 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.

File:

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

kernel/arch/amd64/src/amd64.c

@@ -44 +44 @@
 #include <genarch/drivers/ega/ega.h>
 #include <arch/drivers/vesa.h>
-#include <genarch/kbd/i8042.h>
+#include <genarch/drivers/i8042/i8042.h>
+#include <genarch/kbrd/kbrd.h>
 #include <arch/drivers/i8254.h>
 #include <arch/drivers/i8259.h>
@@ -190 +191 @@
 {
         devno_t devno = device_assign_devno();
-        /* keyboard controller */
-        (void) i8042_init((i8042_t *) I8042_BASE, devno, IRQ_KBD);
+
+        /*
+         * Initialize the keyboard module and conect it to stdin. Then
+         * initialize the i8042 controller and connect it to kbrdin. Enable
+         * keyboard interrupts.
+         */
+        kbrd_init(stdin);
+        (void) i8042_init((i8042_t *) I8042_BASE, devno, IRQ_KBD, &kbrdin);
+        trap_virtual_enable_irqs(1 << IRQ_KBD);
 
         /*