Changes in kernel/arch/ia64/src/drivers/ski.c [aafed15:a01f732] in mainline

File:

• kernel/arch/ia64/src/drivers/ski.c (modified) (7 diffs)

kernel/arch/ia64/src/drivers/ski.c

@@ -37 +37 @@
 #include <console/console.h>
 #include <console/chardev.h>
+#include <ddi/ddi.h>
 #include <sysinfo/sysinfo.h>
 #include <stdint.h>
@@ -69 +70 @@
 
 static ski_instance_t *instance = NULL;
+static parea_t ski_parea;
 
 /** Ask debug console if a key was pressed.
@@ -105 +107 @@
         int count = POLL_LIMIT;
 
+        if (ski_parea.mapped && !console_override)
+                return;
+
         while (count > 0) {
                 wchar_t ch = ski_getchar();
@@ -122 +127 @@
 
         while (true) {
-                // TODO FIXME:
-                // This currently breaks the kernel console
-                // before we get the override from uspace.
-                if (console_override)
-                        poll_keyboard(instance);
-
+                poll_keyboard(instance);
                 thread_usleep(POLL_INTERVAL);
         }
@@ -140 +140 @@
 static void ski_init(void)
 {
+        uintptr_t faddr;
+
         if (instance)
                 return;
@@ -150 +152 @@
             : "r15", "r8"
         );
+
+        faddr = frame_alloc(1, FRAME_LOWMEM | FRAME_ATOMIC, 0);
+        if (faddr == 0)
+                panic("Cannot allocate page for ski console.");
+
+        ddi_parea_init(&ski_parea);
+        ski_parea.pbase = faddr;
+        ski_parea.frames = 1;
+        ski_parea.unpriv = false;
+        ski_parea.mapped = false;
+        ddi_parea_register(&ski_parea);
+
+        sysinfo_set_item_val("ski.paddr", NULL, (sysarg_t) faddr);
 
         instance = malloc(sizeof(ski_instance_t));
@@ -190 +205 @@
 static void ski_putwchar(outdev_t *dev, wchar_t ch)
 {
-        // TODO FIXME:
-        // This currently breaks the kernel console
-        // before we get the override from uspace.
-        if (console_override) {
-                if (ascii_check(ch)) {
-                        if (ch == '\n')
-                                ski_do_putchar('\r');
-
-                        ski_do_putchar(ch);
-                } else {
-                        ski_do_putchar('?');
-                }
+        if (ski_parea.mapped && !console_override)
+                return;
+
+        if (ascii_check(ch)) {
+                if (ch == '\n')
+                        ski_do_putchar('\r');
+
+                ski_do_putchar(ch);
+        } else {
+                ski_do_putchar('?');
         }
 }