Changeset 448e093 in mainline

Timestamp:

2018-02-13T10:07:22Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

06ae793

Parents:

38b0ae2

git-author:

Jiri Svoboda <jiri@…> (2018-02-12 21:06:46)

git-committer:

Jiri Svoboda <jiri@…> (2018-02-13 10:07:22)

Message:

Fix function names, other minor tweaks.

Location:

kernel/genarch

Files:

• include/genarch/drivers/ns16550/ns16550.h (modified) (3 diffs)
• src/drivers/ns16550/ns16550.c (modified) (6 diffs)

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

@@ -50 +50 @@
 
 /** NS16550 registers. */
-enum {
+typedef enum {
         NS16550_REG_RBR = 0,  /**< Receiver Buffer Register (read). */
         NS16550_REG_THR = 0,  /**< Transmitter Holder Register (write). */
@@ -59 +59 @@
         NS16550_REG_MCR = 4,  /**< Modem Control Register. */
         NS16550_REG_LSR = 5,  /**< Line Status Register. */
-};
+} ns16550_reg_t;
 
 /** Structure representing the ns16550 device. */
@@ -71 +71 @@
 } ns16550_instance_t;
 
-extern ns16550_instance_t *ns16550_init(ioport8_t *, int, inr_t, cir_t, void *,
-    outdev_t **);
+extern ns16550_instance_t *ns16550_init(ioport8_t *, unsigned, inr_t, cir_t,
+    void *, outdev_t **);
 extern void ns16550_wire(ns16550_instance_t *, indev_t *);
 

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

@@ -47 +47 @@
 #define LSR_TH_READY    0x20
 
-static inline uint8_t _read(ns16550_instance_t *inst, int reg) {
+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 inline void _write(ns16550_instance_t *inst, int reg, uint8_t val) {
+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);
 }
@@ -59 +62 @@
         ns16550_instance_t *instance = irq->instance;
 
-        if (_read(instance, NS16550_REG_LSR) & LSR_DATA_READY)
+        if (ns16550_reg_read(instance, NS16550_REG_LSR) & LSR_DATA_READY)
                 return IRQ_ACCEPT;
         else
@@ -69 +72 @@
         ns16550_instance_t *instance = irq->instance;
         
-        while (_read(instance, NS16550_REG_LSR) & LSR_DATA_READY) {
-                uint8_t data = _read(instance, NS16550_REG_RBR);
+        while (ns16550_reg_read(instance, NS16550_REG_LSR) & LSR_DATA_READY) {
+                uint8_t data = ns16550_reg_read(instance, NS16550_REG_RBR);
                 indev_push_character(instance->input, data);
         }
@@ -78 +81 @@
 static void ns16550_clear_buffer(ns16550_instance_t *instance)
 {
-        while (_read(instance, NS16550_REG_LSR) & LSR_DATA_READY)
-                (void) _read(instance, NS16550_REG_RBR);
+        while (ns16550_reg_read(instance, NS16550_REG_LSR) & LSR_DATA_READY)
+                (void) ns16550_reg_read(instance, NS16550_REG_RBR);
 }
 
 static void ns16550_sendb(ns16550_instance_t *instance, uint8_t byte)
 {
-        while (!(_read(instance, NS16550_REG_LSR) & LSR_TH_READY))
+        while (!(ns16550_reg_read(instance, NS16550_REG_LSR) & LSR_TH_READY))
                 ;
-        _write(instance, NS16550_REG_THR, byte);
+        ns16550_reg_write(instance, NS16550_REG_THR, byte);
 }
 
@@ -122 +125 @@
  *
  */
-ns16550_instance_t *ns16550_init(ioport8_t *dev, int reg_shift, inr_t inr,
+ns16550_instance_t *ns16550_init(ioport8_t *dev, unsigned reg_shift, inr_t inr,
     cir_t cir, void *cir_arg, outdev_t **output)
 {
@@ -176 +179 @@
         
         /* Enable interrupts */
-        _write(instance, NS16550_REG_IER, IER_ERBFI);
-        _write(instance, NS16550_REG_MCR, MCR_OUT2);
+        ns16550_reg_write(instance, NS16550_REG_IER, IER_ERBFI);
+        ns16550_reg_write(instance, NS16550_REG_MCR, MCR_OUT2);
 }