Changeset 3da166f0 in mainline for kernel/genarch/src/drivers/ns16550/ns16550.c

Timestamp:

2014-12-08T19:34:48Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f42adef

Parents:

7785ebd7 (diff), 21b6307 (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:

Merge from lp:~martin-sucha/helenos/kernel-serial

File:

• kernel/genarch/src/drivers/ns16550/ns16550.c (modified) (6 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);
         }
 }
@@ -73 +75 @@
 }
 
+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.
  *
  * @param dev      Addrress of the beginning of the device in I/O space.
- * @param devno    Device number.
  * @param inr      Interrupt number.
  * @param cir      Clear interrupt function.
  * @param cir_arg  First argument to cir.
+ * @param output   Where to store pointer to the output device
+ *                 or NULL if the caller is not interested in
+ *                 writing to the serial port.
  *
  * @return Keyboard instance or NULL on failure.
  *
  */
-ns16550_instance_t *ns16550_init(ns16550_t *dev, inr_t inr, cir_t cir, void *cir_arg)
+ns16550_instance_t *ns16550_init(ns16550_t *dev, inr_t inr, cir_t cir,
+    void *cir_arg, outdev_t **output)
 {
         ns16550_instance_t *instance
@@ -90 +119 @@
         if (instance) {
                 instance->ns16550 = dev;
-                instance->kbrdin = NULL;
+                instance->input = NULL;
+                instance->output = NULL;
+                
+                if (output) {
+                        instance->output = malloc(sizeof(outdev_t),
+                            FRAME_ATOMIC);
+                        if (!instance->output) {
+                                free(instance);
+                                return NULL;
+                        }
+                        
+                        outdev_initialize("ns16550", instance->output,
+                            &ns16550_ops);
+                        instance->output->data = instance;
+                        *output = instance->output;
+                }
                 
                 irq_initialize(&instance->irq);
@@ -100 +144 @@
                 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 +155 @@
 }
 
-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);