WebSVN – HelenOS – Diff – /trunk/kernel/arch/ia64/src/drivers/ski.c

  * @{
  */
 /** @file
  */
-#include <arch/ski/ski.h>
+#include <arch/drivers/ski.h>
 #include <console/console.h>
 #include <console/chardev.h>
 #include <sysinfo/sysinfo.h>
 #include <arch/types.h>
 #include <proc/thread.h>
 #include <arch/asm.h>
 #include <arch/drivers/kbd.h>
 #include <string.h>
 #include <arch.h>
-static indev_t skiin;       /**< Ski input device. */
+#define POLL_INTERVAL  10000  /* 10 ms */
-static outdev_t skiout;     /**< Ski output device. */
+#define SKI_INIT_CONSOLE  20
+#define SKI_GETCHAR       21
+#define SKI_PUTCHAR       31
+static void ski_putchar(outdev_t *, const wchar_t, bool);
+static outdev_operations_t skiout_ops = {
+    .write = ski_putchar
+};
+static outdev_t skiout;            /**< Ski output device. */
+static bool initialized = false;
-static bool kbd_disabled;
+static bool kbd_disabled = false;
+/** Initialize debug console
+ *
+ * Issue SSC (Simulator System Call) to
+ * to open debug console.
+ *
+ */
+static void ski_init(void)
+{
+    if (initialized)
+        return;
+    asm volatile (
+        "mov r15 = %0\n"
+        "break 0x80000\n"
+        :
+        : "i" (SKI_INIT_CONSOLE)
+        : "r15", "r8"
+    );
+    initialized = true;
+}
 static void ski_do_putchar(const wchar_t ch)
+{
     asm volatile (
         "mov r15 = %[cmd]\n"
         "mov r32 = %[ch]\n"   /* r32 is in0 */
-        "break 0x80000\n"  /* modifies r8 */
+        "break 0x80000\n"     /* modifies r8 */
+        :
         : [cmd] "i" (SKI_PUTCHAR), [ch] "r" (ch)
         : "r15", "in0", "r8"
     );
+}
 /** Display character on debug console
+ *
  * Use SSC (Simulator System Call) to
  * display character on debug console.
+ *
- * @param d Character device.
+ * @param dev    Character device.
- * @param ch Character to be printed.
+ * @param ch     Character to be printed.
+ * @param silent Whether the output should be silenced.
+ *
  */
-static void ski_putchar(outdev_t *d, const wchar_t ch, bool silent)
+static void ski_putchar(outdev_t *dev, const wchar_t ch, bool silent)
+{
     if (!silent) {
         if (ascii_check(ch)) {
             if (ch == '\n')
                 ski_do_putchar('\r');
             ski_do_putchar(ch);
         } else
-            ski_do_putchar(SPECIAL);
+            ski_do_putchar(U_SPECIAL);
+    }
+}
-static indev_operations_t skiin_ops = {
+void skiout_init(void)
-    .poll = NULL
-};
+{
+    ski_init();
-static outdev_operations_t skiout_ops = {
+    outdev_initialize("skiout", &skiout, &skiout_ops);
-    .write = ski_putchar
+    stdout = &skiout;
+    sysinfo_set_item_val("fb", NULL, false);
-};
+}
 /** Ask debug console if a key was pressed.
+ *
  * Use SSC (Simulator System Call) to
  * get character from debug console.
+ *
  * This call is non-blocking.
+ *
  * @return ASCII code of pressed key or 0 if no key pressed.
+ *
  */
-static int32_t ski_getchar(void)
+static wchar_t ski_getchar(void)
+{
     uint64_t ch;
     asm volatile (
         "mov r15 = %1\n"
-        "break 0x80000;;\n" /* modifies r8 */
+        "break 0x80000;;\n"  /* modifies r8 */
         "mov %0 = r8;;\n"
         : "=r" (ch)
         : "i" (SKI_GETCHAR)
         : "r15", "r8"
     );
-    return (int32_t) ch;
+    return (wchar_t) ch;
+}
 /** Ask keyboard if a key was pressed. */
-static void poll_keyboard(void)
+static void poll_keyboard(ski_instance_t *instance)
+{
-    char ch;
     if (kbd_disabled)
         return;
-    ch = ski_getchar();
+    wchar_t ch = ski_getchar();
-    if(ch == '\r')
-        ch = '\n';
-    if (ch) {
+    if (ch != 0)
-        indev_push_character(&skiin, ch);
+        indev_push_character(instance->srlnin, ch);
-        return;
-    }
+}
-#define POLL_INTERVAL           10000           /* 10 ms */
 /** Kernel thread for polling keyboard. */
-static void kkbdpoll(void *arg)
+static void kskipoll(void *arg)
+{
+    ski_instance_t *instance = (ski_instance_t *) arg;
-    while (1) {
+    while (true) {
-        if (!silent) {
+        if (!silent)
-            poll_keyboard();
+            poll_keyboard(instance);
-        }
         thread_usleep(POLL_INTERVAL);
+    }
+}
-/** Initialize debug console
- *
- * Issue SSC (Simulator System Call) to
- * to open debug console.
- */
-static void ski_init(void)
+ski_instance_t *skiin_init(void)
+{
-    static bool initialized;
-    if (initialized)
+    ski_init();
-        return;
-    asm volatile (
-        "mov r15 = %0\n"
-        "break 0x80000\n"
+    ski_instance_t *instance
-        :
-        : "i" (SKI_INIT_CONSOLE)
+        = malloc(sizeof(ski_instance_t), FRAME_ATOMIC);
-        : "r15", "r8"
-    );
+    if (instance) {
+        instance->thread = thread_create(kskipoll, (void *) instance, TASK, 0, "kskipoll", true);
+        if (!instance->thread) {
+            free(instance);
+            return NULL;
+        }
-    initialized = true;
+        instance->srlnin = NULL;
+    }
+    return instance;
+}
-indev_t *skiin_init(void)
+void skiin_wire(ski_instance_t *instance, indev_t *srlnin)
+{
-    ski_init();
+    ASSERT(instance);
+    ASSERT(srlnin);
-    indev_initialize("skiin", &skiin, &skiin_ops);
+    instance->srlnin = srlnin;
-    thread_t *t = thread_create(kkbdpoll, NULL, TASK, 0, "kkbdpoll", true);
-    if (t)
-        thread_ready(t);
+    thread_ready(instance->thread);
-    else
-        return NULL;
     sysinfo_set_item_val("kbd", NULL, true);
     sysinfo_set_item_val("kbd.type", NULL, KBD_SKI);
-    return &skiin;
-}
-void skiout_init(void)
-{
-    ski_init();
-    outdev_initialize("skiout", &skiout, &skiout_ops);
-    stdout = &skiout;
-    sysinfo_set_item_val("fb", NULL, false);
+}
 void ski_kbd_grab(void)
+{
     kbd_disabled = true;

Subversion Repositories HelenOS

(root)/trunk/kernel/arch/ia64/src/drivers/ski.c – Rev 4223 → 4311