Changeset c2417bc in mainline for kernel/arch/ia32/src/ia32.c

Timestamp:

2009-04-21T12:46:26Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

f2d2c7ba

Parents:

44b7783

Message:

change the way how input devices are wired together according to ticket #44
(also the proposal ​http://lists.modry.cz/cgi-bin/private/helenos-devel/2009-March/002507.html)

File:

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

kernel/arch/ia32/src/ia32.c

@@ -81 +81 @@
 {
         /* Parse multiboot information obtained from the bootloader. */
-        multiboot_info_parse(signature, mi);    
+        multiboot_info_parse(signature, mi);
         
 #ifdef CONFIG_SMP
@@ -156 +156 @@
          * module and connect it to i8042. Enable keyboard interrupts.
          */
-        indev_t *kbrdin = i8042_init((i8042_t *) I8042_BASE, IRQ_KBD);
-        if (kbrdin) {
-                kbrd_init(kbrdin);
-                trap_virtual_enable_irqs(1 << IRQ_KBD);
+        i8042_instance_t *i8042_instance = i8042_init((i8042_t *) I8042_BASE, IRQ_KBD);
+        if (i8042_instance) {
+                kbrd_instance_t *kbrd_instance = kbrd_init();
+                if (kbrd_instance) {
+                        indev_t *sink = stdin_wire();
+                        indev_t *kbrd = kbrd_wire(kbrd_instance, sink);
+                        i8042_wire(i8042_instance, kbrd);
+                        trap_virtual_enable_irqs(1 << IRQ_KBD);
+                }
         }