WebSVN – HelenOS – Diff – /trunk/kernel/genarch/src/kbd/ns16550.c

 #include <console/console.h>
 #include <interrupt.h>
 #include <arch/interrupt.h>
 #include <sysinfo/sysinfo.h>
 #include <synch/spinlock.h>
+#include <mm/slab.h>
 #define LSR_DATA_READY  0x01
-/** Structure representing the ns16550. */
-static ns16550_t ns16550;
-/** Structure for ns16550's IRQ. */
-static irq_t ns16550_irq;
+static irq_t *ns16550_irq;
 /*
  * These codes read from ns16550 data register are silently ignored.
  */
 #define IGNORE_CODE 0x7f        /* all keys up */
 static void ns16550_resume(chardev_t *);
 static chardev_operations_t ops = {
     .suspend = ns16550_suspend,
     .resume = ns16550_resume,
-    .read = ns16550_key_read
 };
-void ns16550_interrupt(void);
 /** Initialize keyboard and service interrupts using kernel routine */
 void ns16550_grab(void)
+{
     ipl_t ipl = interrupts_disable();
-    ns16550_ier_write(&ns16550, IER_ERBFI);     /* enable receiver interrupt */
-    while (ns16550_lsr_read(&ns16550) & LSR_DATA_READY)
-        (void) ns16550_rbr_read(&ns16550);
-    spinlock_lock(&ns16550_irq.lock);
+    spinlock_lock(&ns16550_irq->lock);
-    ns16550_irq.notif_cfg.notify = false;
+    ns16550_irq->notif_cfg.notify = false;
-    spinlock_unlock(&ns16550_irq.lock);
+    spinlock_unlock(&ns16550_irq->lock);
     interrupts_restore(ipl);
+}
 /** Resume the former interrupt vector */
 void ns16550_release(void)
+{
     ipl_t ipl = interrupts_disable();
-    spinlock_lock(&ns16550_irq.lock);
+    spinlock_lock(&ns16550_irq->lock);
-    if (ns16550_irq.notif_cfg.answerbox)
+    if (ns16550_irq->notif_cfg.answerbox)
-        ns16550_irq.notif_cfg.notify = true;
+        ns16550_irq->notif_cfg.notify = true;
-    spinlock_unlock(&ns16550_irq.lock);
+    spinlock_unlock(&ns16550_irq->lock);
     interrupts_restore(ipl);
+}
 /** Initialize ns16550.
+ *
+ * @param dev       Addrress of the beginning of the device in I/O space.
  * @param devno     Device number.
- * @param port      Virtual/IO address of device's registers.
  * @param inr       Interrupt number.
  * @param cir       Clear interrupt function.
  * @param cir_arg   First argument to cir.
+ *
+ * @return      True on success, false on failure.
  */
-void
+bool
-ns16550_init(devno_t devno, ioport_t port, inr_t inr, cir_t cir, void *cir_arg)
+ns16550_init(ns16550_t *dev, devno_t devno, inr_t inr, cir_t cir, void *cir_arg)
+{
+    ns16550_instance_t *instance;
+    irq_t *irq;
     chardev_initialize("ns16550_kbd", &kbrd, &ops);
     stdin = &kbrd;
+    instance = malloc(sizeof(ns16550_instance_t), FRAME_ATOMIC);
+    if (!instance)
+        return false;
+    irq = malloc(sizeof(irq_t), FRAME_ATOMIC);
+    if (!irq) {
+        free(instance);
+        return false;
+    }
-    ns16550.devno = devno;
+    instance->devno = devno;
+    instance->ns16550 = dev;
-    ns16550.io_port = port;
+    instance->irq = irq;
-    irq_initialize(&ns16550_irq);
+    irq_initialize(irq);
-    ns16550_irq.devno = devno;
+    irq->devno = devno;
-    ns16550_irq.inr = inr;
+    irq->inr = inr;
-    ns16550_irq.claim = ns16550_claim;
+    irq->claim = ns16550_claim;
-    ns16550_irq.handler = ns16550_irq_handler;
+    irq->handler = ns16550_irq_handler;
+    irq->instance = instance;
-    ns16550_irq.cir = cir;
+    irq->cir = cir;
-    ns16550_irq.cir_arg = cir_arg;
+    irq->cir_arg = cir_arg;
-    irq_register(&ns16550_irq);
+    irq_register(irq);
+    ns16550_irq = irq;  /* TODO: remove me soon */
-    while ((ns16550_lsr_read(&ns16550) & LSR_DATA_READY))
+    while ((pio_read_8(&dev->lsr) & LSR_DATA_READY))
-        ns16550_rbr_read(&ns16550);
+        (void) pio_read_8(&dev->rbr);
     sysinfo_set_item_val("kbd", NULL, true);
     sysinfo_set_item_val("kbd.type", NULL, KBD_NS16550);
     sysinfo_set_item_val("kbd.devno", NULL, devno);
     sysinfo_set_item_val("kbd.inr", NULL, inr);
-    sysinfo_set_item_val("kbd.address.virtual", NULL, port);
+    sysinfo_set_item_val("kbd.address.virtual", NULL, (uintptr_t) dev);
-    sysinfo_set_item_val("kbd.port", NULL, port);
+    sysinfo_set_item_val("kbd.port", NULL, (uintptr_t) dev);
     /* Enable interrupts */
-    ns16550_ier_write(&ns16550, IER_ERBFI);
+    pio_write_8(&dev->ier, IER_ERBFI);
-    ns16550_mcr_write(&ns16550, MCR_OUT2);
+    pio_write_8(&dev->mcr, MCR_OUT2);
-    uint8_t c;
-    // This switches rbr & ier to mode when accept baudrate constant
-    c = ns16550_lcr_read(&ns16550);
-    ns16550_lcr_write(&ns16550, 0x80 | c);
-    ns16550_rbr_write(&ns16550, 0x0c);
-    ns16550_ier_write(&ns16550, 0x00);
-    ns16550_lcr_write(&ns16550, c);
     ns16550_grab();
-}
-/** Process ns16550 interrupt. */
-void ns16550_interrupt(void)
-{
-    ns16550_poll();
+    return true;
+}
 /* Called from getc(). */
 void ns16550_resume(chardev_t *d)
+{
 /* Called from getc(). */
 void ns16550_suspend(chardev_t *d)
+{
+}
-char ns16550_key_read(chardev_t *d)
+irq_ownership_t ns16550_claim(void *instance)
+{
-    char ch;
+    ns16550_instance_t *ns16550_instance = instance;
+    ns16550_t *dev = ns16550_instance->ns16550;
-    while(!(ch = active_read_buff_read())) {
-        uint8_t x;
-        while (!(ns16550_lsr_read(&ns16550) & LSR_DATA_READY));
+    if (pio_read_8(&dev->lsr) & LSR_DATA_READY)
-        x = ns16550_rbr_read(&ns16550);
-        if (x != IGNORE_CODE) {
+        return IRQ_ACCEPT;
-            if (x & KEY_RELEASE)
-                key_released(x ^ KEY_RELEASE);
-            else
+    else
-                active_read_key_pressed(x);
-        }
-    }
-    return ch;
+        return IRQ_DECLINE;
+}
-/** Poll for key press and release events.
- *
- * This function can be used to implement keyboard polling.
- */
-void ns16550_poll(void)
+void ns16550_irq_handler(irq_t *irq)
+{
+    if (irq->notif_cfg.notify && irq->notif_cfg.answerbox) {
+        /*
+         * This will hopefully go to the IRQ dispatch code soon.
+         */
+        ipc_irq_send_notif(irq);
+        return;
+    }
+    ns16550_instance_t *ns16550_instance = irq->instance;
+    ns16550_t *dev = ns16550_instance->ns16550;
-    while (ns16550_lsr_read(&ns16550) & LSR_DATA_READY) {
+    if (pio_read_8(&dev->lsr) & LSR_DATA_READY) {
         uint8_t x;
-        x = ns16550_rbr_read(&ns16550);
+        x = pio_read_8(&dev->rbr);
         if (x != IGNORE_CODE) {
             if (x & KEY_RELEASE)
                 key_released(x ^ KEY_RELEASE);
             else
                 key_pressed(x);
+        }
+    }
-}
-irq_ownership_t ns16550_claim(void *instance)
-{
-    return (ns16550_lsr_read(&ns16550) & LSR_DATA_READY);
-}
-void ns16550_irq_handler(irq_t *irq)
-{
-    if (irq->notif_cfg.notify && irq->notif_cfg.answerbox)
-        ipc_irq_send_notif(irq);
-    else
-        ns16550_interrupt();
+}
 /** @}
  */

Subversion Repositories HelenOS

(root)/trunk/kernel/genarch/src/kbd/ns16550.c – Rev 3906 → 3934