Changeset 3c79afe in mainline for kernel/genarch/include/drivers/ns16550/ns16550.h

Timestamp:

2009-03-12T17:54:24Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

3a1c048

Parents:

a0e1b48

Message:

update for the new scheme of wiring device drivers to keyboard/serial modules

File:

• kernel/genarch/include/drivers/ns16550/ns16550.h (modified) (2 diffs)

kernel/genarch/include/drivers/ns16550/ns16550.h

@@ -27 +27 @@
  */
 
-/** @addtogroup genarch 
+/** @addtogroup genarch
  * @{
  */
 /**
  * @file
- * @brief       Headers for NS 16550 serial controller.
+ * @brief Headers for NS 16550 serial controller.
  */
 
@@ -42 +42 @@
 #include <console/chardev.h>
 
-#define IER_ERBFI       0x01    /** Enable Receive Buffer Full Interrupt. */
+#define IER_ERBFI  0x01  /** Enable Receive Buffer Full Interrupt. */
 
-#define LCR_DLAB        0x80    /** Divisor Latch Access bit. */
+#define LCR_DLAB   0x80  /** Divisor Latch Access bit. */
 
-#define MCR_OUT2        0x08    /** OUT2. */
+#define MCR_OUT2   0x08  /** OUT2. */
 
 /** NS16550 registers. */
-struct ns16550 {
-        ioport8_t rbr;  /**< Receiver Buffer Register. */
-        ioport8_t ier;  /**< Interrupt Enable Register. */
+typedef struct {
+        ioport8_t rbr;      /**< Receiver Buffer Register. */
+        ioport8_t ier;      /**< Interrupt Enable Register. */
         union {
-                ioport8_t iir;  /**< Interrupt Ident Register (read). */
-                ioport8_t fcr;  /**< FIFO control register (write). */
+                ioport8_t iir;  /**< Interrupt Ident Register (read). */
+                ioport8_t fcr;  /**< FIFO control register (write). */
         } __attribute__ ((packed));
-        ioport8_t lcr;  /**< Line Control register. */
-        ioport8_t mcr;  /**< Modem Control Register. */
-        ioport8_t lsr;  /**< Line Status Register. */
-} __attribute__ ((packed));
-typedef struct ns16550 ns16550_t;
+        ioport8_t lcr;      /**< Line Control register. */
+        ioport8_t mcr;      /**< Modem Control Register. */
+        ioport8_t lsr;      /**< Line Status Register. */
+} __attribute__ ((packed)) ns16550_t;
 
 /** Structure representing the ns16550 device. */
-typedef struct ns16550_instance {
+typedef struct {
         devno_t devno;
         ns16550_t *ns16550;
         irq_t irq;
-        chardev_t *devout;
+        indev_t kbrdin;
 } ns16550_instance_t;
 
-extern bool ns16550_init(ns16550_t *, devno_t, inr_t, cir_t, void *,
-    chardev_t *);
-extern irq_ownership_t ns16550_claim(irq_t *);
-extern void ns16550_irq_handler(irq_t *);
+extern indev_t *ns16550_init(ns16550_t *, devno_t, inr_t, cir_t, void *)
 
 #endif