Changes in kernel/genarch/src/drivers/ns16550/ns16550.c [21b6307:9d58539] in mainline

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)
@@ -64 +62 @@
         if (pio_read_8(&dev->lsr) & LSR_DATA_READY) {
                 uint8_t data = pio_read_8(&dev->rbr);
-                indev_push_character(instance->input, data);
+                indev_push_character(instance->kbrdin, data);
         }
 }
@@ -75 +73 @@
 }
 
-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, outdev_t **output)
+ns16550_instance_t *ns16550_init(ns16550_t *dev, inr_t inr, cir_t cir, void *cir_arg)
 {
         ns16550_instance_t *instance
@@ -119 +90 @@
         if (instance) {
                 instance->ns16550 = dev;
-                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;
-                }
+                instance->kbrdin = NULL;
                 
                 irq_initialize(&instance->irq);
@@ -144 +100 @@
                 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);
         }
         
@@ -155 +105 @@
 }
 
-void ns16550_wire(ns16550_instance_t *instance, indev_t *input)
+void ns16550_wire(ns16550_instance_t *instance, indev_t *kbrdin)
 {
         ASSERT(instance);
-        ASSERT(input);
+        ASSERT(kbrdin);
         
-        instance->input = input;
+        instance->kbrdin = kbrdin;
         irq_register(&instance->irq);