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

Timestamp:

2009-04-21T12:46:26Z (15 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/ia64/src/ia64.c (modified) (6 diffs)

kernel/arch/ia64/src/ia64.c

@@ -34 +34 @@
 
 #include <arch.h>
-#include <arch/ski/ski.h>
+#include <arch/drivers/ski.h>
 #include <arch/drivers/it.h>
 #include <arch/interrupt.h>
@@ -149 +149 @@
 void arch_post_smp_init(void)
 {
-#ifdef SKI
-        indev_t *in;
-        in = skiin_init();
-        if (in)
-                srln_init(in);
+#ifdef MACHINE_ski
+        ski_instance_t *ski_instance = skiin_init();
+        if (ski_instance) {
+                srln_instance_t *srln_instance = srln_init();
+                if (srln_instance) {
+                        indev_t *sink = stdin_wire();
+                        indev_t *srln = srln_wire(srln_instance, sink);
+                        skiin_wire(ski_instance, srln);
+                }
+        }
+        
         skiout_init();
 #endif
@@ -162 +168 @@
         
 #ifdef CONFIG_NS16550
-        indev_t *kbrdin_ns16550
+        ns16550_instance_t *ns16550_instance
             = ns16550_init((ns16550_t *) NS16550_BASE, NS16550_IRQ, NULL, NULL);
-        if (kbrdin_ns16550)
-                srln_init(kbrdin_ns16550);
+        if (ns16550_instance) {
+                srln_instance_t *srln_instance = srln_init();
+                if (srln_instance) {
+                        indev_t *sink = stdin_wire();
+                        indev_t *srln = srln_wire(srln_instance, sink);
+                        ns16550_wire(ns16550_instance, srln);
+                }
+        }
         
         sysinfo_set_item_val("kbd", NULL, true);
@@ -177 +189 @@
         
 #ifdef CONFIG_I8042
-        indev_t *kbrdin_i8042 = i8042_init((i8042_t *) I8042_BASE, IRQ_KBD);
-        if (kbrdin_i8042)
-                kbrd_init(kbrdin_i8042);
+        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);
+                }
+        }
         
         sysinfo_set_item_val("kbd", NULL, true);
@@ -239 +257 @@
 void arch_grab_console(void)
 {
-#ifdef SKI
+#ifdef MACHINE_ski
         ski_kbd_grab();
 #endif
@@ -249 +267 @@
 void arch_release_console(void)
 {
-#ifdef SKI
+#ifdef MACHINE_ski
         ski_kbd_release();
 #endif