WebSVN – HelenOS – Diff – /branches/dynload/kernel/genarch/src/kbd/i8042.c

 /*
- * Copyright (c) 2001-2004 Jakub Jermar
+ * Copyright (c) 2009 Jakub Jermar
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 #include <genarch/kbd/i8042.h>
 #include <arch/drivers/kbd.h>
 #include <genarch/kbd/key.h>
 #include <genarch/kbd/scanc.h>
 #include <genarch/kbd/scanc_pc.h>
-#include <arch/drivers/i8042.h>
+#include <genarch/drivers/legacy/ia32/io.h>
 #include <cpu.h>
 #include <arch/asm.h>
 #include <arch.h>
 #include <console/chardev.h>
 #include <console/console.h>
 #include <interrupt.h>
-#include <sysinfo/sysinfo.h>
-#include <ipc/irq.h>
 /* Keyboard commands. */
 #define KBD_ENABLE  0xf4
 #define KBD_DISABLE 0xf5
 #define KBD_ACK     0xfa
 #define i8042_SET_COMMAND   0x60
 #define i8042_COMMAND       0x69
 #define i8042_BUFFER_FULL_MASK  0x01
-#define i8042_WAIT_MASK         0x02
+#define i8042_WAIT_MASK     0x02
-#define i8042_MOUSE_DATA        0x20
+#define i8042_MOUSE_DATA    0x20
 static void i8042_suspend(chardev_t *);
 static void i8042_resume(chardev_t *);
 static chardev_operations_t ops = {
     .suspend = i8042_suspend,
     .resume = i8042_resume,
-    .read = i8042_key_read
 };
-/** Structure for i8042's IRQ. */
-static irq_t i8042_kbd_irq;
-static irq_t i8042_mouse_irq;
+static irq_ownership_t i8042_claim(irq_t *irq)
-void i8042_grab(void)
+{
-    ipl_t ipl = interrupts_disable();
-    spinlock_lock(&i8042_kbd_irq.lock);
-    i8042_kbd_irq.notif_cfg.notify = false;
+    i8042_instance_t *i8042_instance = irq->instance;
-    spinlock_unlock(&i8042_kbd_irq.lock);
-    spinlock_lock(&i8042_mouse_irq.lock);
-    i8042_mouse_irq.notif_cfg.notify = false;
+    i8042_t *dev = i8042_instance->i8042;
-    spinlock_unlock(&i8042_mouse_irq.lock);
+    if (pio_read_8(&dev->status) & i8042_BUFFER_FULL_MASK)
-    interrupts_restore(ipl);
+        return IRQ_ACCEPT;
-}
-void i8042_release(void)
-{
-    ipl_t ipl = interrupts_disable();
-    spinlock_lock(&i8042_kbd_irq.lock);
-    if (i8042_kbd_irq.notif_cfg.answerbox)
-        i8042_kbd_irq.notif_cfg.notify = true;
-    spinlock_unlock(&i8042_kbd_irq.lock);
-    spinlock_lock(&i8042_mouse_irq.lock);
-    if (i8042_mouse_irq.notif_cfg.answerbox)
-        i8042_mouse_irq.notif_cfg.notify = true;
-    spinlock_unlock(&i8042_mouse_irq.lock);
+    else
-    interrupts_restore(ipl);
-}
-static irq_ownership_t i8042_claim(void *instance)
-{
-    return IRQ_ACCEPT;
+        return IRQ_DECLINE;
+}
 static void i8042_irq_handler(irq_t *irq)
+{
-    if (irq->notif_cfg.notify && irq->notif_cfg.answerbox)
+    i8042_instance_t *instance = irq->instance;
-        ipc_irq_send_notif(irq);
+    i8042_t *dev = instance->i8042;
-    else {
-        uint8_t data;
+    uint8_t data;
-        uint8_t status;
+    uint8_t status;
-        while (((status = i8042_status_read()) & i8042_BUFFER_FULL_MASK)) {
+    if (((status = pio_read_8(&dev->status)) & i8042_BUFFER_FULL_MASK)) {
-            data = i8042_data_read();
+        data = pio_read_8(&dev->data);
-            if ((status & i8042_MOUSE_DATA))
+        if ((status & i8042_MOUSE_DATA))
-                continue;
+            return;
-            if (data & KEY_RELEASE)
+        if (data & KEY_RELEASE)
-                key_released(data ^ KEY_RELEASE);
+            key_released(data ^ KEY_RELEASE);
-            else
+        else
-                key_pressed(data);
+            key_pressed(data);
-        }
+    }
+}
 /** Initialize i8042. */
+bool
-void i8042_init(devno_t kbd_devno, inr_t kbd_inr, devno_t mouse_devno, inr_t mouse_inr)
+i8042_init(i8042_t *dev, devno_t devno, inr_t inr)
+{
+    i8042_instance_t *instance;
     chardev_initialize("i8042_kbd", &kbrd, &ops);
     stdin = &kbrd;
-    irq_initialize(&i8042_kbd_irq);
+    instance = malloc(sizeof(i8042_instance_t), FRAME_ATOMIC);
-    i8042_kbd_irq.devno = kbd_devno;
+    if (!instance)
-    i8042_kbd_irq.inr = kbd_inr;
+        return false;
-    i8042_kbd_irq.claim = i8042_claim;
+    instance->devno = devno;
-    i8042_kbd_irq.handler = i8042_irq_handler;
-    irq_register(&i8042_kbd_irq);
+    instance->i8042 = dev;
-    irq_initialize(&i8042_mouse_irq);
+    irq_initialize(&instance->irq);
-    i8042_mouse_irq.devno = mouse_devno;
+    instance->irq.devno = devno;
-    i8042_mouse_irq.inr = mouse_inr;
+    instance->irq.inr = inr;
-    i8042_mouse_irq.claim = i8042_claim;
+    instance->irq.claim = i8042_claim;
-    i8042_mouse_irq.handler = i8042_irq_handler;
+    instance->irq.handler = i8042_irq_handler;
+    instance->irq.instance = instance;
-    irq_register(&i8042_mouse_irq);
+    irq_register(&instance->irq);
-    trap_virtual_enable_irqs(1 << kbd_inr);
+    trap_virtual_enable_irqs(1 << inr);
-    trap_virtual_enable_irqs(1 << mouse_inr);
     /*
      * Clear input buffer.
-     * Number of iterations is limited to prevent infinite looping.
      */
-    int i;
-    for (i = 0; (i8042_status_read() & i8042_BUFFER_FULL_MASK) && i < 100; i++) {
+    while (pio_read_8(&dev->status) & i8042_BUFFER_FULL_MASK)
-        i8042_data_read();
+        (void) pio_read_8(&dev->data);
-    }
-    sysinfo_set_item_val("kbd", NULL, true);
-    sysinfo_set_item_val("kbd.devno", NULL, kbd_devno);
-    sysinfo_set_item_val("kbd.inr", NULL, kbd_inr);
-#ifdef KBD_LEGACY
-    sysinfo_set_item_val("kbd.type", NULL, KBD_LEGACY);
-#endif
-    sysinfo_set_item_val("mouse", NULL, true);
-    sysinfo_set_item_val("mouse.devno", NULL, mouse_devno);
-    sysinfo_set_item_val("mouse.inr", NULL, mouse_inr);
-    i8042_grab();
+    return true;
+}
 /* Called from getc(). */
 void i8042_resume(chardev_t *d)
+{
 /* Called from getc(). */
 void i8042_suspend(chardev_t *d)
+{
+}
-char i8042_key_read(chardev_t *d)
-{
-    char ch;
-    while (!(ch = active_read_buff_read())) {
-        uint8_t x;
-        while (!(i8042_status_read() & i8042_BUFFER_FULL_MASK));
-        x = i8042_data_read();
-        if (x & KEY_RELEASE)
-            key_released(x ^ KEY_RELEASE);
-        else
-            active_read_key_pressed(x);
-    }
-    return ch;
-}
-/** Poll for key press and release events.
- *
- * This function can be used to implement keyboard polling.
- */
-void i8042_poll(void)
-{
-    uint8_t x;
-    while (((x = i8042_status_read() & i8042_BUFFER_FULL_MASK))) {
-        x = i8042_data_read();
-        if (x & KEY_RELEASE)
-            key_released(x ^ KEY_RELEASE);
-        else
-            key_pressed(x);
-    }
-}
 /** @}
  */

Subversion Repositories HelenOS

(root)/branches/dynload/kernel/genarch/src/kbd/i8042.c – Rev 4343 → 4344