Changeset 6bbe470 in mainline for kernel/genarch/src/drivers/ns16550/ns16550.c

Timestamp:

2012-10-29T22:56:18Z (12 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

21b6307

Parents:

5030acad

Message:

Implement output in ns16550 driver.

File:

• kernel/genarch/src/drivers/ns16550/ns16550.c (modified) (7 diffs)

kernel/genarch/src/drivers/ns16550/ns16550.c

@@ -41 +41 @@
 #include <mm/slab.h>
 #include <ddi/device.h>
+#include <str.h>
 
 #define LSR_DATA_READY  0x01
+#define LSR_TH_READY    0x20
 
 static irq_ownership_t ns16550_claim(irq_t *irq)
@@ -62 +64 @@
         if (pio_read_8(&dev->lsr) & LSR_DATA_READY) {
                 uint8_t data = pio_read_8(&dev->rbr);
-                indev_push_character(instance->kbrdin, data);
+                indev_push_character(instance->input, data);
         }
 }
@@ -72 +74 @@
                 (void) pio_read_8(&dev->rbr);
 }
+
+static void ns16550_sendb(ns16550_t *dev, uint8_t byte)
+{
+        while (!(pio_read_8(&dev->lsr) & LSR_TH_READY))
+                ;
+        pio_write_8(&dev->thr, byte);
+}
+
+static void ns16550_putchar(outdev_t *dev, wchar_t ch)
+{
+        ns16550_instance_t *instance = (ns16550_instance_t *) dev->data;
+        
+        if ((!instance->parea.mapped) || (console_override)) {
+                if (ascii_check(ch))
+                        ns16550_sendb(instance->ns16550, (uint8_t) ch);
+                else
+                        ns16550_sendb(instance->ns16550, U_SPECIAL);
+        }
+}
+
+static outdev_operations_t ns16550_ops = {
+        .write = ns16550_putchar,
+        .redraw = NULL
+};
 
 /** Initialize ns16550.
@@ -90 +116 @@
         if (instance) {
                 instance->ns16550 = dev;
-                instance->kbrdin = NULL;
+                instance->input = NULL;
+                instance->output = NULL;
                 
                 irq_initialize(&instance->irq);
@@ -100 +127 @@
                 instance->irq.cir = cir;
                 instance->irq.cir_arg = cir_arg;
+                
+                instance->parea.pbase = (uintptr_t) dev;
+                instance->parea.frames = 1;
+                instance->parea.unpriv = false;
+                instance->parea.mapped = false;
+                ddi_parea_register(&instance->parea);
         }
         
@@ -105 +138 @@
 }
 
-void ns16550_wire(ns16550_instance_t *instance, indev_t *kbrdin)
+void ns16550_wire(ns16550_instance_t *instance, indev_t *input)
 {
         ASSERT(instance);
-        ASSERT(kbrdin);
+        ASSERT(input);
         
-        instance->kbrdin = kbrdin;
+        instance->input = input;
         irq_register(&instance->irq);
         
@@ -120 +153 @@
 }
 
+outdev_t *ns16550_output(ns16550_instance_t *instance)
+{
+        ASSERT(instance);
+        
+        if (instance->output == NULL) {
+                instance->output = malloc(sizeof(outdev_t),
+                    FRAME_ATOMIC);
+                if (instance->output) {
+                        outdev_initialize("ns16550", instance->output,
+                            &ns16550_ops);
+                        instance->output->data = instance;
+                }
+        }
+        
+        return instance->output;
+}
+
 /** @}
  */