Changeset 411b6a6 in mainline for kernel/arch

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

Files:

• amd64/src/amd64.c (modified) (2 diffs)
• ia32/src/ia32.c (modified) (2 diffs)
• ia64/src/ia64.c (modified) (2 diffs)
• ia64/src/smp/smp.c (modified) (1 diff)
• sparc64/src/console.c (modified) (2 diffs)
• sparc64/src/drivers/kbd.c (modified) (3 diffs)
• sparc64/src/sparc64.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);
 
         /*

kernel/arch/ia32/src/ia32.c

@@ -45 +45 @@
 #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>
@@ -148 +149 @@
 {
         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);
 
         /*

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>

kernel/arch/sparc64/src/console.c

@@ -41 +41 @@
 #include <arch/drivers/sgcn.h>
 
-#ifdef CONFIG_Z8530
-#include <genarch/kbd/z8530.h>
-#endif
-#ifdef CONFIG_NS16550
-#include <genarch/kbd/ns16550.h>
-#endif
-
 #include <console/chardev.h>
 #include <console/console.h>
@@ -71 +64 @@
 {
 #ifdef CONFIG_FB
-        stdin = NULL;
-
         ofw_tree_property_t *prop;
         ofw_tree_node_t *screen;

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);
                 
                 /*

kernel/arch/sparc64/src/sparc64.c

@@ -90 +90 @@
                  */
                 irq_init(1 << 11, 128);
-
-                standalone_sparc64_console_init();
         }
 }
@@ -105 +103 @@
 void arch_post_smp_init(void)
 {
-        static thread_t *t = NULL;
+        if (config.cpu_active == 1) {
+                standalone_sparc64_console_init();
 
-        if (!t) {
-                /*
-                 * Create thread that polls keyboard.
-                 */
-                t = thread_create(kkbdpoll, NULL, TASK, 0, "kkbdpoll", true);
+                /* Create thread that polls keyboard.
+                 * XXX: this is only used by sgcn now
+                 */
+                thread_t *t = thread_create(kkbdpoll, NULL, TASK, 0, "kkbdpoll",
+                    true);
                 if (!t)
                         panic("Cannot create kkbdpoll.");