Changeset 411b6a6 in mainline for kernel/arch/sparc64/src/drivers/kbd.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/sparc64/src/drivers/kbd.c (modified) (3 diffs)

kernel/arch/sparc64/src/drivers/kbd.c

@@ -35 +35 @@
 #include <arch/drivers/kbd.h>
 #include <genarch/ofw/ofw_tree.h>
+
+#ifdef CONFIG_SUN_KBD
+#include <genarch/kbrd/kbrd.h>
+#endif
 #ifdef CONFIG_Z8530
-#include <genarch/kbd/z8530.h>
+#include <genarch/drivers/z8530/z8530.h>
 #endif
 #ifdef CONFIG_NS16550
-#include <genarch/kbd/ns16550.h>
-#endif
+#include <genarch/drivers/ns16550/ns16550.h>
+#endif
+
+#include <console/console.h>
 #include <ddi/device.h>
 #include <ddi/irq.h>
@@ -160 +166 @@
                 z8530 = (z8530_t *) hw_map(aligned_addr, offset + size) +
                     offset;
-                (void) z8530_init(z8530, devno, inr, cir, cir_arg);
+                kbrd_init(stdin);
+                (void) z8530_init(z8530, devno, inr, cir, cir_arg, &kbrdin);
                 
                 /*
@@ -180 +187 @@
                 ns16550 = (ns16550_t *) hw_map(aligned_addr, offset + size) +
                     offset;
-                (void) ns16550_init(ns16550, devno, inr, cir, cir_arg);
+                kbrd_init(stdin);
+                (void) ns16550_init(ns16550, devno, inr, cir, cir_arg, &kbrdin);
                 
                 /*