Changeset c2417bc in mainline for kernel/arch/arm32/src/arm32.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/arm32/src/arm32.c (modified) (4 diffs)

kernel/arch/arm32/src/arm32.c

@@ -36 +36 @@
 #include <arch.h>
 #include <config.h>
-#include <arch/console.h>
 #include <genarch/fb/fb.h>
 #include <genarch/fb/visuals.h>
@@ -43 +42 @@
 #include <genarch/srln/srln.h>
 #include <sysinfo/sysinfo.h>
+#include <console/console.h>
 #include <ddi/irq.h>
 #include <arch/drivers/gxemul.h>
@@ -130 +130 @@
         /*
          * Initialize the GXemul keyboard port. Then initialize the serial line
-         * module and connect it to the GXemul keyboard. Enable keyboard interrupts.
+         * module and connect it to the GXemul keyboard.
          */
-        indev_t *kbrdin = dsrlnin_init((dsrlnin_t *) gxemul_kbd, GXEMUL_KBD_IRQ);
-        if (kbrdin)
-                srln_init(kbrdin);
+        dsrlnin_instance_t *dsrlnin_instance
+            = dsrlnin_init((dsrlnin_t *) gxemul_kbd, GXEMUL_KBD_IRQ);
+        if (dsrlnin_instance) {
+                srln_instance_t *srln_instance = srln_init();
+                if (srln_instance) {
+                        indev_t *sink = stdin_wire();
+                        indev_t *srln = srln_wire(srln_instance, sink);
+                        dsrlnin_wire(dsrlnin_instance, srln);
+                }
+        }
         
         /*
@@ -202 +209 @@
 }
 
+/** Acquire console back for kernel. */
+void arch_grab_console(void)
+{
+#ifdef CONFIG_FB
+        fb_redraw();
+#endif
+}
+
+/** Return console to userspace. */
+void arch_release_console(void)
+{
+}
+
 /** @}
  */