Changes in uspace/drv/char/ns8250/ns8250.c [c7235d40:128c78b] in mainline

File:

• uspace/drv/char/ns8250/ns8250.c (modified) (36 diffs)

uspace/drv/char/ns8250/ns8250.c

@@ -74 +74 @@
 #define DLAB_MASK (1 << 7)
 
-/** Interrupt Enable Register definition. */
-#define NS8250_IER_RXREADY      (1 << 0)
-#define NS8250_IER_THRE         (1 << 1)
-#define NS8250_IER_RXSTATUS     (1 << 2)
-#define NS8250_IER_MODEM_STATUS (1 << 3)
-
-/** Interrupt ID Register definition. */
-#define NS8250_IID_ACTIVE       (1 << 0)
-
-/** FIFO Control Register definition. */
-#define NS8250_FCR_FIFOENABLE   (1 << 0)
-#define NS8250_FCR_RXFIFORESET  (1 << 1)
-#define NS8250_FCR_TXFIFORESET  (1 << 2)
-#define NS8250_FCR_DMAMODE      (1 << 3)
-#define NS8250_FCR_RXTRIGGERLOW (1 << 6)
-#define NS8250_FCR_RXTRIGGERHI  (1 << 7)
-
-/** Line Control Register definition. */
-#define NS8250_LCR_STOPBITS     (1 << 2)
-#define NS8250_LCR_PARITY       (1 << 3)
-#define NS8250_LCR_SENDBREAK    (1 << 6)
-#define NS8250_LCR_DLAB         (1 << 7)
-
-/** Modem Control Register definition. */
-#define NS8250_MCR_DTR          (1 << 0)
-#define NS8250_MCR_RTS          (1 << 1)
-#define NS8250_MCR_OUT1         (1 << 2)
-#define NS8250_MCR_OUT2         (1 << 3)
-#define NS8250_MCR_LOOPBACK     (1 << 4)
-#define NS8250_MCR_ALL          (0x1f)
-
-/** Line Status Register definition. */
-#define NS8250_LSR_RXREADY      (1 << 0)
-#define NS8250_LSR_OE           (1 << 1)
-#define NS8250_LSR_PE           (1 << 2)
-#define NS8250_LSR_FE           (1 << 3)
-#define NS8250_LSR_BREAK        (1 << 4)
-#define NS8250_LSR_THRE         (1 << 5)
-#define NS8250_LSR_TSE          (1 << 6)
-
-/** Modem Status Register definition. */
-#define NS8250_MSR_DELTACTS     (1 << 0)
-#define NS8250_MSR_DELTADSR     (1 << 1)
-#define NS8250_MSR_RITRAILING   (1 << 2)
-#define NS8250_MSR_DELTADCD     (1 << 3)
-#define NS8250_MSR_CTS          (1 << 4)
-#define NS8250_MSR_DSR          (1 << 5)
-#define NS8250_MSR_RI           (1 << 6)
-#define NS8250_MSR_DCD          (1 << 7)
-#define NS8250_MSR_SIGNALS      (NS8250_MSR_CTS | NS8250_MSR_DSR \
-    | NS8250_MSR_RI | NS8250_MSR_DCD)
-
 /** Obtain soft-state structure from function node */
 #define NS8250(fnode) ((ns8250_t *) ((fnode)->dev->driver_data))
@@ -148 +96 @@
 } stop_bit_t;
 
-/** 8250 UART registers layout. */
-typedef struct {
-        ioport8_t data;         /**< Data register. */
-        ioport8_t ier;          /**< Interrupt Enable Reg. */
-        ioport8_t iid;          /**< Interrupt ID Reg. */
-        ioport8_t lcr;          /**< Line Control Reg. */
-        ioport8_t mcr;          /**< Modem Control Reg. */
-        ioport8_t lsr;          /**< Line Status Reg. */
-        ioport8_t msr;          /**< Modem Status Reg. */
-} ns8250_regs_t;
-
 /** The driver data for the serial port devices. */
 typedef struct ns8250 {
@@ -165 +102 @@
         /** DDF function node */
         ddf_fun_t *fun;
-        /** I/O registers **/
-        ns8250_regs_t *regs;
         /** Is there any client conntected to the device? */
         bool client_connected;
@@ -189 +124 @@
  *                      otherwise.
  */
-static bool ns8250_received(ns8250_regs_t *regs)
-{
-        return (pio_read_8(&regs->lsr) & NS8250_LSR_RXREADY) != 0;
+static bool ns8250_received(ioport8_t *port)
+{
+        return (pio_read_8(port + 5) & 1) != 0;
 }
 
@@ -199 +134 @@
  * @return              The data read.
  */
-static uint8_t ns8250_read_8(ns8250_regs_t *regs)
-{
-        return pio_read_8(&regs->data);
+static uint8_t ns8250_read_8(ioport8_t *port)
+{
+        return pio_read_8(port);
 }
 
@@ -208 +143 @@
  * @param port          The base address of the serial port device's ports.
  */
-static bool is_transmit_empty(ns8250_regs_t *regs)
-{
-        return (pio_read_8(&regs->lsr) & NS8250_LSR_THRE) != 0;
+static bool is_transmit_empty(ioport8_t *port)
+{
+        return (pio_read_8(port + 5) & 0x20) != 0;
 }
 
@@ -218 +153 @@
  * @param c             The character to be written to the serial port device.
  */
-static void ns8250_write_8(ns8250_regs_t *regs, uint8_t c)
-{
-        while (!is_transmit_empty(regs))
+static void ns8250_write_8(ioport8_t *port, uint8_t c)
+{
+        while (!is_transmit_empty(port))
                 ;
         
-        pio_write_8(&regs->data, c);
+        pio_write_8(port, c);
 }
 
@@ -258 +193 @@
 {
         fibril_mutex_lock(&ns->mutex);
-        ns8250_write_8(ns->regs, c);
+        ns8250_write_8(ns->port, c);
         fibril_mutex_unlock(&ns->mutex);
 }
@@ -277 +212 @@
                 ns8250_putchar(ns, (uint8_t) buf[idx]);
         
-        return count;
+        return 0;
 }
 
@@ -288 +223 @@
 };
 
-static int ns8250_dev_add(ddf_dev_t *dev);
+static int ns8250_add_device(ddf_dev_t *dev);
 static int ns8250_dev_remove(ddf_dev_t *dev);
 
 /** The serial port device driver's standard operations. */
 static driver_ops_t ns8250_ops = {
-        .dev_add = &ns8250_dev_add,
+        .add_device = &ns8250_add_device,
         .dev_remove = &ns8250_dev_remove
 };
@@ -331 +266 @@
                 return false;
         }
-
-        ns->regs = (ns8250_regs_t *)ns->port;
         
         return true;
@@ -346 +279 @@
         ddf_msg(LVL_DEBUG, "ns8250_dev_probe %s", ns->dev->name);
         
+        ioport8_t *port_addr = ns->port;
         bool res = true;
         uint8_t olddata;
         
-        olddata = pio_read_8(&ns->regs->mcr);
-        
-        pio_write_8(&ns->regs->mcr, NS8250_MCR_LOOPBACK);
-        if (pio_read_8(&ns->regs->msr) & NS8250_MSR_SIGNALS)
+        olddata = pio_read_8(port_addr + 4);
+        
+        pio_write_8(port_addr + 4, 0x10);
+        if (pio_read_8(port_addr + 6) & 0xf0)
                 res = false;
         
-        pio_write_8(&ns->regs->mcr, NS8250_MCR_ALL);
-        if ((pio_read_8(&ns->regs->msr) & NS8250_MSR_SIGNALS) 
-            != NS8250_MSR_SIGNALS)
+        pio_write_8(port_addr + 4, 0x1f);
+        if ((pio_read_8(port_addr + 6) & 0xf0) != 0xf0)
                 res = false;
         
-        pio_write_8(&ns->regs->mcr, olddata);
+        pio_write_8(port_addr + 4, olddata);
         
         if (!res) {
@@ -457 +390 @@
  * @param port          The base address of the serial port device's ports.
  */
-static inline void ns8250_port_interrupts_enable(ns8250_regs_t *regs)
-{
-        /* Interrupt when data received. */
-        pio_write_8(&regs->ier, NS8250_IER_RXREADY);
-        pio_write_8(&regs->mcr, NS8250_MCR_DTR | NS8250_MCR_RTS 
-            | NS8250_MCR_OUT2);
+static inline void ns8250_port_interrupts_enable(ioport8_t *port)
+{
+        pio_write_8(port + 1, 0x1);     /* Interrupt when data received. */
+        pio_write_8(port + 4, 0xB);
 }
 
@@ -469 +400 @@
  * @param port          The base address of the serial port device's ports
  */
-static inline void ns8250_port_interrupts_disable(ns8250_regs_t *regs)
-{
-        pio_write_8(&regs->ier, 0x0);   /* Disable all interrupts. */
+static inline void ns8250_port_interrupts_disable(ioport8_t *port)
+{
+        pio_write_8(port + 1, 0x0);     /* Disable all interrupts. */
 }
 
@@ -500 +431 @@
 
         /* Enable interrupt on the serial port. */
-        ns8250_port_interrupts_enable(ns->regs);
+        ns8250_port_interrupts_enable(ns->port);
         
         return EOK;
@@ -512 +443 @@
  * @param port          The base address of the serial port device's ports.
  */
-static inline void enable_dlab(ns8250_regs_t *regs)
-{
-        uint8_t val = pio_read_8(&regs->lcr);
-        pio_write_8(&regs->lcr, val | NS8250_LCR_DLAB);
+static inline void enable_dlab(ioport8_t *port)
+{
+        uint8_t val = pio_read_8(port + 3);
+        pio_write_8(port + 3, val | DLAB_MASK);
 }
 
@@ -522 +453 @@
  * @param port          The base address of the serial port device's ports.
  */
-static inline void clear_dlab(ns8250_regs_t *regs)
-{
-        uint8_t val = pio_read_8(&regs->lcr);
-        pio_write_8(&regs->lcr, val & (~NS8250_LCR_DLAB));
+static inline void clear_dlab(ioport8_t *port)
+{
+        uint8_t val = pio_read_8(port + 3);
+        pio_write_8(port + 3, val & (~DLAB_MASK));
 }
 
@@ -535 +466 @@
  *                      if the specified baud_rate is not valid).
  */
-static int ns8250_port_set_baud_rate(ns8250_regs_t *regs, unsigned int baud_rate)
+static int ns8250_port_set_baud_rate(ioport8_t *port, unsigned int baud_rate)
 {
         uint16_t divisor;
@@ -551 +482 @@
         
         /* Enable DLAB to be able to access baud rate divisor. */
-        enable_dlab(regs);
+        enable_dlab(port);
         
         /* Set divisor low byte. */
-        pio_write_8(&regs->data, div_low);
+        pio_write_8(port + 0, div_low);
         /* Set divisor high byte. */
-        pio_write_8(&regs->ier, div_high);
-        
-        clear_dlab(regs);
+        pio_write_8(port + 1, div_high);
+        
+        clear_dlab(port);
         
         return EOK;
@@ -568 +499 @@
  * @param baud_rate     The ouput parameter to which the baud rate is stored.
  */
-static unsigned int ns8250_port_get_baud_rate(ns8250_regs_t *regs)
+static unsigned int ns8250_port_get_baud_rate(ioport8_t *port)
 {
         uint16_t divisor;
@@ -574 +505 @@
         
         /* Enable DLAB to be able to access baud rate divisor. */
-        enable_dlab(regs);
+        enable_dlab(port);
         
         /* Get divisor low byte. */
-        div_low = pio_read_8(&regs->data);
+        div_low = pio_read_8(port + 0);
         /* Get divisor high byte. */
-        div_high = pio_read_8(&regs->ier);
-        
-        clear_dlab(regs);
+        div_high = pio_read_8(port + 1);
+        
+        clear_dlab(port);
         
         divisor = (div_high << 8) | div_low;
@@ -594 +525 @@
  * @param stop_bits     The number of stop bits used (one or two).
  */
-static void ns8250_port_get_com_props(ns8250_regs_t *regs, unsigned int *parity,
+static void ns8250_port_get_com_props(ioport8_t *port, unsigned int *parity,
     unsigned int *word_length, unsigned int *stop_bits)
 {
         uint8_t val;
         
-        val = pio_read_8(&regs->lcr);
-        *parity = ((val >> NS8250_LCR_PARITY) & 7);
+        val = pio_read_8(port + 3);
+        *parity = ((val >> 3) & 7);
         
         switch (val & 3) {
@@ -617 +548 @@
         }
         
-        if ((val >> NS8250_LCR_STOPBITS) & 1)
+        if ((val >> 2) & 1)
                 *stop_bits = 2;
         else
@@ -631 +562 @@
  *                      is invalid.
  */
-static int ns8250_port_set_com_props(ns8250_regs_t *regs, unsigned int parity,
+static int ns8250_port_set_com_props(ioport8_t *port, unsigned int parity,
     unsigned int word_length, unsigned int stop_bits)
 {
@@ -655 +586 @@
         switch (stop_bits) {
         case 1:
-                val |= ONE_STOP_BIT << NS8250_LCR_STOPBITS;
+                val |= ONE_STOP_BIT << 2;
                 break;
         case 2:
-                val |= TWO_STOP_BITS << NS8250_LCR_STOPBITS;
+                val |= TWO_STOP_BITS << 2;
                 break;
         default:
@@ -670 +601 @@
         case SERIAL_MARK_PARITY:
         case SERIAL_SPACE_PARITY:
-                val |= parity << NS8250_LCR_PARITY;
+                val |= parity << 3;
                 break;
         default:
@@ -676 +607 @@
         }
         
-        pio_write_8(&regs->lcr, val);
+        pio_write_8(port + 3, val);
         
         return EOK;
@@ -689 +620 @@
 static void ns8250_initialize_port(ns8250_t *ns)
 {
+        ioport8_t *port = ns->port;
+        
         /* Disable interrupts. */
-        ns8250_port_interrupts_disable(ns->regs);
+        ns8250_port_interrupts_disable(port);
         /* Set baud rate. */
-        ns8250_port_set_baud_rate(ns->regs, 38400);
+        ns8250_port_set_baud_rate(port, 38400);
         /* 8 bits, no parity, two stop bits. */
-        ns8250_port_set_com_props(ns->regs, SERIAL_NO_PARITY, 8, 2);
+        ns8250_port_set_com_props(port, SERIAL_NO_PARITY, 8, 2);
         /* Enable FIFO, clear them, with 14-byte threshold. */
-        pio_write_8(&ns->regs->iid, NS8250_FCR_FIFOENABLE
-            | NS8250_FCR_RXFIFORESET | NS8250_FCR_TXFIFORESET 
-            | NS8250_FCR_RXTRIGGERLOW | NS8250_FCR_RXTRIGGERHI);
+        pio_write_8(port + 2, 0xC7);
         /*
          * RTS/DSR set (Request to Send and Data Terminal Ready lines enabled),
          * Aux Output2 set - needed for interrupts.
          */
-        pio_write_8(&ns->regs->mcr, NS8250_MCR_DTR | NS8250_MCR_RTS
-            | NS8250_MCR_OUT2);
+        pio_write_8(port + 4, 0x0B);
 }
 
@@ -714 +644 @@
 {
         /* Disable FIFO */
-        pio_write_8(&ns->regs->iid, 0x00);
+        pio_write_8(ns->port + 2, 0x00);
         /* Disable DTR, RTS, OUT1, OUT2 (int. enable) */
-        pio_write_8(&ns->regs->mcr, 0x00);
+        pio_write_8(ns->port + 4, 0x00);
         /* Disable all interrupts from the port */
-        ns8250_port_interrupts_disable(ns->regs);
+        ns8250_port_interrupts_disable(ns->port);
 }
 
@@ -728 +658 @@
 static void ns8250_read_from_device(ns8250_t *ns)
 {
-        ns8250_regs_t *regs = ns->regs;
+        ioport8_t *port = ns->port;
         bool cont = true;
         
@@ -734 +664 @@
                 fibril_mutex_lock(&ns->mutex);
                 
-                cont = ns8250_received(regs);
+                cont = ns8250_received(port);
                 if (cont) {
-                        uint8_t val = ns8250_read_8(regs);
+                        uint8_t val = ns8250_read_8(port);
                         
                         if (ns->client_connected) {
@@ -787 +717 @@
 }
 
-/** The dev_add callback method of the serial port driver.
+/** The add_device callback method of the serial port driver.
  *
  * Probe and initialize the newly added device.
@@ -793 +723 @@
  * @param dev           The serial port device.
  */
-static int ns8250_dev_add(ddf_dev_t *dev)
+static int ns8250_add_device(ddf_dev_t *dev)
 {
         ns8250_t *ns = NULL;
@@ -800 +730 @@
         int rc;
         
-        ddf_msg(LVL_DEBUG, "ns8250_dev_add %s (handle = %d)",
+        ddf_msg(LVL_DEBUG, "ns8250_add_device %s (handle = %d)",
             dev->name, (int) dev->handle);
         
@@ -966 +896 @@
 {
         ns8250_t *data = (ns8250_t *) dev->driver_data;
-        ns8250_regs_t *regs = data->regs;
+        ioport8_t *port = data->port;
         
         fibril_mutex_lock(&data->mutex);
-        ns8250_port_interrupts_disable(regs);
-        *baud_rate = ns8250_port_get_baud_rate(regs);
-        ns8250_port_get_com_props(regs, parity, word_length, stop_bits);
-        ns8250_port_interrupts_enable(regs);
+        ns8250_port_interrupts_disable(port);
+        *baud_rate = ns8250_port_get_baud_rate(port);
+        ns8250_port_get_com_props(port, parity, word_length, stop_bits);
+        ns8250_port_interrupts_enable(port);
         fibril_mutex_unlock(&data->mutex);
         
@@ -997 +927 @@
         
         ns8250_t *data = (ns8250_t *) dev->driver_data;
-        ns8250_regs_t *regs = data->regs;
+        ioport8_t *port = data->port;
         int ret;
         
         fibril_mutex_lock(&data->mutex);
-        ns8250_port_interrupts_disable(regs);
-        ret = ns8250_port_set_baud_rate(regs, baud_rate);
+        ns8250_port_interrupts_disable(port);
+        ret = ns8250_port_set_baud_rate(port, baud_rate);
         if (ret == EOK)
-                ret = ns8250_port_set_com_props(regs, parity, word_length, stop_bits);
-        ns8250_port_interrupts_enable(regs);
+                ret = ns8250_port_set_com_props(port, parity, word_length, stop_bits);
+        ns8250_port_interrupts_enable(port);
         fibril_mutex_unlock(&data->mutex);