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

kernel/arch/mips32/src/mips32.c

@@ -37 +37 @@
 #include <arch/exception.h>
 #include <mm/as.h>
-
 #include <userspace.h>
-#include <arch/console.h>
 #include <memstr.h>
 #include <proc/thread.h>
 #include <proc/uarg.h>
 #include <print.h>
+#include <console/console.h>
 #include <syscall/syscall.h>
 #include <sysinfo/sysinfo.h>
-
 #include <arch/interrupt.h>
 #include <console/chardev.h>
@@ -60 +58 @@
 #include <string.h>
 #include <arch/drivers/msim.h>
-
 #include <arch/asm/regname.h>
 
@@ -170 +167 @@
          * module and connect it to the msim/GXemul keyboard. Enable keyboard interrupts.
          */
-        indev_t *kbrdin = dsrlnin_init((dsrlnin_t *) MSIM_KBD_ADDRESS, MSIM_KBD_IRQ);
-        if (kbrdin) {
-                srln_init(kbrdin);
-                cp0_unmask_int(MSIM_KBD_IRQ);
+        dsrlnin_instance_t *dsrlnin_instance
+            = dsrlnin_init((dsrlnin_t *) MSIM_KBD_ADDRESS, MSIM_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);
+                        cp0_unmask_int(MSIM_KBD_IRQ);
+                }
         }
         
@@ -249 +252 @@
 }
 
+void arch_grab_console(void)
+{
+#ifdef CONFIG_FB
+        fb_redraw();
+#endif
+}
+
+/** Return console to userspace
+ *
+ */
+void arch_release_console(void)
+{
+}
+
 /** @}
  */