Changeset 3e53ab7 in mainline for kernel/genarch

Timestamp:

2008-11-28T19:33:10Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7905360

Parents:

4c4ddbe9

Message:

Initial support for interrupt driven driver for ns16550.

Location:

kernel/genarch

Files:

• include/kbd/ns16550.h (modified) (2 diffs)
• src/kbd/ns16550.c (modified) (5 diffs)

kernel/genarch/include/kbd/ns16550.h

@@ -59 +59 @@
 #define FCR_REG         2       /** FIFO control register (write). */
 #define LCR_REG         3       /** Line Control register. */
+#define MCR_REG         4       /** Modem Control Register. */
 #define LSR_REG         5       /** Line Status Register. */
 
@@ -65 +66 @@
 #define LCR_DLAB        0x80    /** Divisor Latch Access bit. */
 
+#define MCR_OUT2        0x08    /** OUT2. */
+
 /** Structure representing the ns16550 device. */
 typedef struct {
         devno_t devno;
-        volatile ioport_t io_port;      /** Memory mapped registers of the ns16550. */
+        /** Memory mapped registers of the ns16550. */
+        volatile ioport_t io_port;
 } ns16550_t;
 
 static inline uint8_t ns16550_rbr_read(ns16550_t *dev)
 {
-        return inb(dev->io_port+RBR_REG);
+        return inb(dev->io_port + RBR_REG);
 }
 static inline void ns16550_rbr_write(ns16550_t *dev, uint8_t v)
 {
-        outb(dev->io_port+RBR_REG,v);
+        outb(dev->io_port + RBR_REG, v);
 }
 
 static inline uint8_t ns16550_ier_read(ns16550_t *dev)
 {
-        return inb(dev->io_port+IER_REG);
+        return inb(dev->io_port + IER_REG);
 }
 
 static inline void ns16550_ier_write(ns16550_t *dev, uint8_t v)
 {
-        outb(dev->io_port+IER_REG,v);
+        outb(dev->io_port + IER_REG, v);
 }
 
 static inline uint8_t ns16550_iir_read(ns16550_t *dev)
 {
-        return inb(dev->io_port+IIR_REG);
+        return inb(dev->io_port + IIR_REG);
 }
 
 static inline void ns16550_fcr_write(ns16550_t *dev, uint8_t v)
 {
-        outb(dev->io_port+FCR_REG,v);
+        outb(dev->io_port + FCR_REG, v);
 }
 
 static inline uint8_t ns16550_lcr_read(ns16550_t *dev)
 {
-        return inb(dev->io_port+LCR_REG);
+        return inb(dev->io_port + LCR_REG);
 }
 
 static inline void ns16550_lcr_write(ns16550_t *dev, uint8_t v)
 {
-        outb(dev->io_port+LCR_REG,v);
+        outb(dev->io_port + LCR_REG, v);
 }
 
 static inline uint8_t ns16550_lsr_read(ns16550_t *dev)
 {
-        return inb(dev->io_port+LSR_REG);
+        return inb(dev->io_port + LSR_REG);
 }
 
+static inline uint8_t ns16550_mcr_read(ns16550_t *dev)
+{
+        return inb(dev->io_port + MCR_REG);
+}
 
+static inline void ns16550_mcr_write(ns16550_t *dev, uint8_t v)
+{
+        outb(dev->io_port + MCR_REG, v);
+}
 
 #endif

kernel/genarch/src/kbd/ns16550.c

@@ -135 +135 @@
         sysinfo_set_item_val("kbd.address.virtual", NULL, port);
 
+#ifdef CONFIG_NS16550_INTERRUPT_DRIVEN
+        /* Enable interrupts */
+        ns16550_ier_write(&ns16550, IER_ERBFI);
+        ns16550_mcr_write(&ns16550, MCR_OUT2);
+#endif
+
 #ifdef ia64
         uint8_t c;
@@ -150 +156 @@
 void ns16550_interrupt(void)
 {
-        /* TODO
-         *
-         * ns16550 works in the polled mode so far.
-         */
+        ns16550_poll();
 }
 
@@ -202 +205 @@
 void ns16550_poll(void)
 {
+#ifndef CONFIG_NS16550_INTERRUPT_DRIVEN 
         ipl_t ipl;
 
@@ -221 +225 @@
         spinlock_unlock(&ns16550_irq.lock);
         interrupts_restore(ipl);
+#endif
 
         while (ns16550_lsr_read(&ns16550) & LSR_DATA_READY) {
@@ -252 +257 @@
 void ns16550_irq_handler(irq_t *irq, void *arg, ...)
 {
-        panic("Not yet implemented, ns16550 works in polled mode.\n");
+        if (irq->notif_cfg.notify && irq->notif_cfg.answerbox)
+                ipc_irq_send_notif(irq);
+        else
+                ns16550_interrupt();
 }