Changeset 3e53ab7 in mainline for kernel/genarch/include/kbd/ns16550.h

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.

File:

• kernel/genarch/include/kbd/ns16550.h (modified) (2 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