Changeset d0c5901 in mainline for arch/ia64/src/ski/ski.c

Timestamp:

2006-06-02T14:07:29Z (19 years ago)

Author:

Jakub Vana <jakub.vana@…>

Branches:

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

Children:

c034b16

Parents:

116d1ef4

Message:

IA64 uspace keyboard kernel part

File:

• arch/ia64/src/ski/ski.c (modified) (3 diffs)

arch/ia64/src/ski/ski.c

@@ -30 +30 @@
 #include <console/console.h>
 #include <console/chardev.h>
+#include <arch/interrupt.h>
+#include <sysinfo/sysinfo.h>
 
-static chardev_t ski_console;
+chardev_t ski_console;
+chardev_t ski_uconsole;
 static bool kb_disable;
+int kbd_uspace=0;
 
 static void ski_putchar(chardev_t *d, const char ch);
@@ -112 +116 @@
         if(ch == '\r')
                 ch = '\n'; 
-        if (ch)
-                chardev_push_character(&ski_console, ch);
+        if (ch){
+                if(kbd_uspace){
+                        chardev_push_character(&ski_uconsole, ch);
+                        virtual_interrupt(IRQ_KBD,NULL);
+                }
+                else {
+                        chardev_push_character(&ski_console, ch);
+
+                }       
+                
+        }       
 }
 
@@ -153 +166 @@
 
         chardev_initialize("ski_console", &ski_console, &ski_ops);
+        chardev_initialize("ski_uconsole", &ski_uconsole, &ski_ops);
         stdin = &ski_console;
         stdout = &ski_console;
+
 }
+/** Setup console sysinfo (i.e. Keyboard IRQ)
+ *
+ * Because sysinfo neads memory allocation/dealocation
+ * this functions should be called separetely from init.
+ *
+ */
+void ski_set_console_sysinfo(void)
+{
+        sysinfo_set_item_val("kbd",NULL,true);
+        sysinfo_set_item_val("kbd.irq",NULL,IRQ_KBD);
+}