Changeset 58775d30 in mainline for kernel/genarch/include/genarch/drivers/ns16550/ns16550.h

Timestamp:

2015-03-16T16:07:21Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2003739

Parents:

6069061 (diff), 795e2bf (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Mainline changes

File:

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

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

@@ -38 +38 @@
 #define KERN_NS16550_H_
 
+#include <ddi/ddi.h>
 #include <ddi/irq.h>
 #include <typedefs.h>
@@ -50 +51 @@
 /** NS16550 registers. */
 typedef struct {
-        ioport8_t rbr;      /**< Receiver Buffer Register. */
+        union {
+                ioport8_t rbr;      /**< Receiver Buffer Register (read). */
+                ioport8_t thr;      /**< Transmitter Holder Register (write). */
+        } __attribute__ ((packed));
         ioport8_t ier;      /**< Interrupt Enable Register. */
         union {
@@ -65 +69 @@
         irq_t irq;
         ns16550_t *ns16550;
-        indev_t *kbrdin;
+        indev_t *input;
+        outdev_t *output;
+        parea_t parea;
 } ns16550_instance_t;
 
-extern ns16550_instance_t *ns16550_init(ns16550_t *, inr_t, cir_t, void *);
+extern ns16550_instance_t *ns16550_init(ns16550_t *, inr_t, cir_t, void *,
+    outdev_t **);
 extern void ns16550_wire(ns16550_instance_t *, indev_t *);