Changeset 2a34e4c in mainline for kernel/arch/ia32/src/ia32.c

Timestamp:

2009-03-12T18:00:23Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

7012a8d

Parents:

0e0490bd

Message:

update for the new scheme of wiring device drivers to keyboard/serial modules
use ega_redraw() only if it is compiled in

File:

• kernel/arch/ia32/src/ia32.c (modified) (4 diffs)

kernel/arch/ia32/src/ia32.c

@@ -114 +114 @@
                 
 #ifdef CONFIG_FB
-                if (vesa_present()) 
+                if (vesa_present())
                         vesa_init();
                 else
@@ -152 +152 @@
 void arch_post_smp_init(void)
 {
+#ifdef CONFIG_PC_KBD
         devno_t devno = device_assign_devno();
-
+        
         /*
-         * Initialize the keyboard module and conect it to stdin. Then
-         * initialize the i8042 controller and connect it to kbrdin. Enable
-         * keyboard interrupts.
+         * Initialize the i8042 controller. Then initialize the keyboard
+         * module and connect it to i8042. Enable keyboard interrupts.
          */
-        kbrd_init(stdin);
-        (void) i8042_init((i8042_t *) I8042_BASE, devno, IRQ_KBD, &kbrdin);
-        trap_virtual_enable_irqs(1 << IRQ_KBD);
-
+        indev_t *kbrdin = i8042_init((i8042_t *) I8042_BASE, devno, IRQ_KBD);
+        if (kbrdin) {
+                kbrd_init(kbrdin);
+                trap_virtual_enable_irqs(1 << IRQ_KBD);
+        }
+        
         /*
          * This is the necessary evil until the userspace driver is entirely
@@ -174 +176 @@
         sysinfo_set_item_val("kbd.address.kernel", NULL,
             (uintptr_t) I8042_BASE);
+#endif
 }
 
@@ -207 +210 @@
 {
 #ifdef CONFIG_FB
-        vesa_redraw();
+        if (vesa_present())
+                vesa_redraw();
+        else
+#endif
+#ifdef CONFIG_EGA
+                ega_redraw();
 #else
-        ega_redraw();
+                {}
 #endif
 }