WebSVN – HelenOS – Diff – /branches/network/kernel/arch/ia64/src/ski/ski.c

  */
 #include <arch/ski/ski.h>
 #include <console/console.h>
 #include <console/chardev.h>
-#include <arch/interrupt.h>
 #include <sysinfo/sysinfo.h>
 #include <arch/types.h>
-#include <ddi/device.h>
-#include <ddi/irq.h>
-#include <ipc/irq.h>
 #include <proc/thread.h>
 #include <synch/spinlock.h>
 #include <arch/asm.h>
+#include <arch/drivers/kbd.h>
+#include <arch.h>
-#define SKI_KBD_INR 0
-static irq_t ski_kbd_irq;
+static indev_t skiin;       /**< Ski input device. */
-static devno_t ski_kbd_devno;
+static outdev_t skiout;     /**< Ski output device. */
-chardev_t ski_console;
-chardev_t ski_uconsole;
 static bool kbd_disabled;
-static void ski_putchar(chardev_t *d, const char ch);
-static int32_t ski_getchar(void);
 /** Display character on debug console
+ *
  * Use SSC (Simulator System Call) to
  * display character on debug console.
+ *
  * @param d Character device.
  * @param ch Character to be printed.
  */
-void ski_putchar(chardev_t *d, const char ch)
+static void ski_putchar(outdev_t *d, const char ch, bool silent)
+{
+    if (!silent) {
-    asm volatile (
+        asm volatile (
-        "mov r15 = %0\n"
+            "mov r15 = %0\n"
-        "mov r32 = %1\n"    /* r32 is in0 */
+            "mov r32 = %1\n"   /* r32 is in0 */
-        "break 0x80000\n"   /* modifies r8 */
+            "break 0x80000\n"  /* modifies r8 */
-        :
+            :
-        : "i" (SKI_PUTCHAR), "r" (ch)
+            : "i" (SKI_PUTCHAR), "r" (ch)
-        : "r15", "in0", "r8"
+            : "r15", "in0", "r8"
-    );
+        );
-    if (ch == '\n')
+        if (ch == '\n')
-        ski_putchar(d, '\r');
+            ski_putchar(d, '\r', false);
+    }
+}
+static indev_operations_t skiin_ops = {
+    .poll = NULL
+};
+static outdev_operations_t skiout_ops = {
+    .write = ski_putchar
+};
 /** 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.
  */
-int32_t ski_getchar(void)
+static int32_t ski_getchar(void)
+{
     uint64_t ch;
     asm volatile (
         "mov r15 = %1\n"
     );
     return (int32_t) ch;
+}
-/**
- * This is a blocking wrapper for ski_getchar().
- * To be used when the kernel crashes.
- */
-static char ski_getchar_blocking(chardev_t *d)
-{
-    int ch;
-    while(!(ch = ski_getchar()))
-        ;
-    if(ch == '\r')
-        ch = '\n';
-    return (char) ch;
-}
 /** Ask keyboard if a key was pressed. */
 static void poll_keyboard(void)
+{
     char ch;
-    static char last;
-    ipl_t ipl;
-    ipl = interrupts_disable();
-    if (kbd_disabled) {
+    if (kbd_disabled)
-        interrupts_restore(ipl);
         return;
-    }
-    spinlock_lock(&ski_kbd_irq.lock);
     ch = ski_getchar();
     if(ch == '\r')
         ch = '\n';
     if (ch) {
-        if (ski_kbd_irq.notif_cfg.notify && ski_kbd_irq.notif_cfg.answerbox) {
-            chardev_push_character(&ski_uconsole, ch);
-            ipc_irq_send_notif(&ski_kbd_irq);
-        } else {
-            chardev_push_character(&ski_console, ch);
+        indev_push_character(&skiin, ch);
-        }
-        last = ch;
-        spinlock_unlock(&ski_kbd_irq.lock);
-        interrupts_restore(ipl);
         return;
+    }
-    if (last) {
-        if (ski_kbd_irq.notif_cfg.notify && ski_kbd_irq.notif_cfg.answerbox) {
-            chardev_push_character(&ski_uconsole, 0);
-            ipc_irq_send_notif(&ski_kbd_irq);
-        }
-        last = 0;
-    }
-    spinlock_unlock(&ski_kbd_irq.lock);
-    interrupts_restore(ipl);
+}
-/* Called from getc(). */
-static void ski_kbd_enable(chardev_t *d)
+#define POLL_INTERVAL           10000           /* 10 ms */
-{
-    kbd_disabled = false;
-}
-/* Called from getc(). */
+/** Kernel thread for polling keyboard. */
-static void ski_kbd_disable(chardev_t *d)
+static void kkbdpoll(void *arg)
-{
-    kbd_disabled = true;
-}
-/** Decline to service hardware IRQ.
- *
- * This is only a virtual IRQ, so always decline.
- *
- * @return Always IRQ_DECLINE.
- */
-static irq_ownership_t ski_kbd_claim(void)
+{
+    while (1) {
+        if (!silent) {
+            poll_keyboard();
+        }
-    return IRQ_DECLINE;
+        thread_usleep(POLL_INTERVAL);
+    }
+}
-static chardev_operations_t ski_ops = {
-    .resume = ski_kbd_enable,
-    .suspend = ski_kbd_disable,
-    .write = ski_putchar,
-    .read = ski_getchar_blocking
-};
 /** Initialize debug console
+ *
  * Issue SSC (Simulator System Call) to
  * to open debug console.
  */
-void ski_init_console(void)
+static void ski_init(void)
+{
+    static bool initialized;
+    if (initialized)
+        return;
     asm volatile (
         "mov r15 = %0\n"
         "break 0x80000\n"
+        :
         : "i" (SKI_INIT_CONSOLE)
         : "r15", "r8"
     );
+    initialized = true;
+}
-    chardev_initialize("ski_console", &ski_console, &ski_ops);
-    chardev_initialize("ski_uconsole", &ski_uconsole, &ski_ops);
-    stdin = &ski_console;
+indev_t *skiin_init(void)
+{
-    stdout = &ski_console;
+    ski_init();
-    ski_kbd_devno = device_assign_devno();
+    indev_initialize("skiin", &skiin, &skiin_ops);
-    irq_initialize(&ski_kbd_irq);
+    thread_t *t = thread_create(kkbdpoll, NULL, TASK, 0, "kkbdpoll", true);
-    ski_kbd_irq.inr = SKI_KBD_INR;
+    if (t)
-    ski_kbd_irq.devno = ski_kbd_devno;
+        thread_ready(t);
-    ski_kbd_irq.claim = ski_kbd_claim;
+    else
-    irq_register(&ski_kbd_irq);
+        return NULL;
     sysinfo_set_item_val("kbd", NULL, true);
-    sysinfo_set_item_val("kbd.inr", NULL, SKI_KBD_INR);
+    sysinfo_set_item_val("kbd.type", NULL, KBD_SKI);
-    sysinfo_set_item_val("kbd.devno", NULL, ski_kbd_devno);
+    return &skiin;
+}
-void ski_kbd_grab(void)
+void skiout_init(void)
+{
-    ipl_t ipl = interrupts_disable();
+    ski_init();
-    spinlock_lock(&ski_kbd_irq.lock);
+    outdev_initialize("skiout", &skiout, &skiout_ops);
-    ski_kbd_irq.notif_cfg.notify = false;
+    stdout = &skiout;
-    spinlock_unlock(&ski_kbd_irq.lock);
+    sysinfo_set_item_val("fb", NULL, false);
-    interrupts_restore(ipl);
+}
-void ski_kbd_release(void)
+void ski_kbd_grab(void)
+{
-    ipl_t ipl = interrupts_disable();
-    spinlock_lock(&ski_kbd_irq.lock);
-    if (ski_kbd_irq.notif_cfg.answerbox)
-        ski_kbd_irq.notif_cfg.notify = true;
+    kbd_disabled = true;
-    spinlock_unlock(&ski_kbd_irq.lock);
-    interrupts_restore(ipl);
+}
-#define POLL_INTERVAL       50000       /* 50 ms */
-/** Kernel thread for polling keyboard. */
-void kkbdpoll(void *arg)
+void ski_kbd_release(void)
+{
-    while (1) {
-        poll_keyboard();
+    kbd_disabled = false;
-        thread_usleep(POLL_INTERVAL);
-    }
+}
 /** @}
  */

Subversion Repositories HelenOS

(root)/branches/network/kernel/arch/ia64/src/ski/ski.c – Rev 3386 → 4153