Changes in kernel/genarch/src/drivers/ns16550/ns16550.c [448e093:24abb85d] in mainline

File:

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

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2009 Jakub Jermar
- * Copyright (c) 2018 CZ.NIC, z.s.p.o.
  * All rights reserved.
  *
@@ -47 +46 @@
 #define LSR_TH_READY    0x20
 
-static uint8_t ns16550_reg_read(ns16550_instance_t *inst, ns16550_reg_t reg)
-{
-        return pio_read_8(&inst->ns16550[reg << inst->reg_shift]);
-}
-
-static void ns16550_reg_write(ns16550_instance_t *inst, ns16550_reg_t reg,
-    uint8_t val)
-{
-        pio_write_8(&inst->ns16550[reg << inst->reg_shift], val);
-}
-
 static irq_ownership_t ns16550_claim(irq_t *irq)
 {
         ns16550_instance_t *instance = irq->instance;
-
-        if (ns16550_reg_read(instance, NS16550_REG_LSR) & LSR_DATA_READY)
+        ns16550_t *dev = instance->ns16550;
+        
+        if (pio_read_8(&dev->lsr) & LSR_DATA_READY)
                 return IRQ_ACCEPT;
         else
@@ -71 +60 @@
 {
         ns16550_instance_t *instance = irq->instance;
+        ns16550_t *dev = instance->ns16550;
         
-        while (ns16550_reg_read(instance, NS16550_REG_LSR) & LSR_DATA_READY) {
-                uint8_t data = ns16550_reg_read(instance, NS16550_REG_RBR);
+        if (pio_read_8(&dev->lsr) & LSR_DATA_READY) {
+                uint8_t data = pio_read_8(&dev->rbr);
                 indev_push_character(instance->input, data);
         }
@@ -79 +69 @@
 
 /**< Clear input buffer. */
-static void ns16550_clear_buffer(ns16550_instance_t *instance)
+static void ns16550_clear_buffer(ns16550_t *dev)
 {
-        while (ns16550_reg_read(instance, NS16550_REG_LSR) & LSR_DATA_READY)
-                (void) ns16550_reg_read(instance, NS16550_REG_RBR);
+        while ((pio_read_8(&dev->lsr) & LSR_DATA_READY))
+                (void) pio_read_8(&dev->rbr);
 }
 
-static void ns16550_sendb(ns16550_instance_t *instance, uint8_t byte)
+static void ns16550_sendb(ns16550_t *dev, uint8_t byte)
 {
-        while (!(ns16550_reg_read(instance, NS16550_REG_LSR) & LSR_TH_READY))
+        while (!(pio_read_8(&dev->lsr) & LSR_TH_READY))
                 ;
-        ns16550_reg_write(instance, NS16550_REG_THR, byte);
+        pio_write_8(&dev->thr, byte);
 }
 
@@ -98 +88 @@
         if ((!instance->parea.mapped) || (console_override)) {
                 if (ascii_check(ch))
-                        ns16550_sendb(instance, (uint8_t) ch);
+                        ns16550_sendb(instance->ns16550, (uint8_t) ch);
                 else
-                        ns16550_sendb(instance, U_SPECIAL);
+                        ns16550_sendb(instance->ns16550, U_SPECIAL);
         }
 }
@@ -111 +101 @@
 /** Initialize ns16550.
  *
- * @param dev        Address of the beginning of the device in I/O space.
- * @param reg_shift  Spacing between individual register addresses, in log2.
- *                   The individual register location is calculated as
- *                   `base + (register offset << reg_shift)`.
- * @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.
+ * @param dev      Addrress of the beginning of the device in I/O space.
+ * @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(ioport8_t *dev, unsigned reg_shift, 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, outdev_t **output)
 {
         ns16550_instance_t *instance
@@ -132 +119 @@
         if (instance) {
                 instance->ns16550 = dev;
-                instance->reg_shift = reg_shift;
                 instance->input = NULL;
                 instance->output = NULL;
@@ -176 +162 @@
         irq_register(&instance->irq);
         
-        ns16550_clear_buffer(instance);
+        ns16550_clear_buffer(instance->ns16550);
         
         /* Enable interrupts */
-        ns16550_reg_write(instance, NS16550_REG_IER, IER_ERBFI);
-        ns16550_reg_write(instance, NS16550_REG_MCR, MCR_OUT2);
+        pio_write_8(&instance->ns16550->ier, IER_ERBFI);
+        pio_write_8(&instance->ns16550->mcr, MCR_OUT2);
 }