Changes in uspace/drv/char/ns8250/ns8250.c [4510e06:c7235d40] in mainline

File:

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

uspace/drv/char/ns8250/ns8250.c

@@ -40 +40 @@
 #include <stdio.h>
 #include <errno.h>
-#include <stdbool.h>
+#include <bool.h>
 #include <fibril_synch.h>
 #include <stdlib.h>
@@ -51 +51 @@
 #include <sys/stat.h>
 #include <ddi.h>
+#include <libarch/ddi.h>
 
 #include <ddf/driver.h>
@@ -57 +58 @@
 #include <ops/char_dev.h>
 
+#include <devman.h>
 #include <ns.h>
+#include <ipc/devman.h>
 #include <ipc/services.h>
 #include <ipc/irc.h>
@@ -79 +82 @@
 /** Interrupt ID Register definition. */
 #define NS8250_IID_ACTIVE       (1 << 0)
-#define NS8250_IID_CAUSE_MASK 0x0e
-#define NS8250_IID_CAUSE_RXSTATUS 0x06
 
 /** FIFO Control Register definition. */
@@ -125 +126 @@
     | NS8250_MSR_RI | NS8250_MSR_DCD)
 
+/** Obtain soft-state structure from function node */
+#define NS8250(fnode) ((ns8250_t *) ((fnode)->dev->driver_data))
+
+/** Obtain soft-state structure from device node */
+#define NS8250_FROM_DEV(dnode) ((ns8250_t *) ((dnode)->driver_data))
+
 /** The number of bits of one data unit send by the serial port. */
 typedef enum {
@@ -160 +167 @@
         /** I/O registers **/
         ns8250_regs_t *regs;
-        /** Are there any clients connected to the device? */
-        unsigned client_connections;
+        /** Is there any client conntected to the device? */
+        bool client_connected;
         /** The irq assigned to this device. */
         int irq;
@@ -168 +175 @@
         /** The i/o port used to access the serial ports registers. */
         ioport8_t *port;
-        /** The buffer for incoming data. */
+        /** The buffer for incomming data. */
         cyclic_buffer_t input_buffer;
         /** The fibril mutex for synchronizing the access to the device. */
         fibril_mutex_t mutex;
-        /** Indicates that some data has become available */
-        fibril_condvar_t input_buffer_available;
         /** True if device is removed. */
         bool removed;
 } ns8250_t;
 
-/** Obtain soft-state structure from device node */
-static ns8250_t *dev_ns8250(ddf_dev_t *dev)
-{
-        return ddf_dev_data_get(dev);
-}
-
-/** Obtain soft-state structure from function node */
-static ns8250_t *fun_ns8250(ddf_fun_t *fun)
-{
-        return dev_ns8250(ddf_fun_get_dev(fun));
-}
-
-/** Find out if there is some incoming data available on the serial port.
+/** Find out if there is some incomming data available on the serial port.
  *
  * @param port          The base address of the serial port device's ports.
@@ -244 +237 @@
 static int ns8250_read(ddf_fun_t *fun, char *buf, size_t count)
 {
-        ns8250_t *ns = fun_ns8250(fun);
-        int ret = 0;
-        
-        if (count == 0) return 0;
+        ns8250_t *ns = NS8250(fun);
+        int ret = EOK;
         
         fibril_mutex_lock(&ns->mutex);
-        while (buf_is_empty(&ns->input_buffer))
-                fibril_condvar_wait(&ns->input_buffer_available, &ns->mutex);
         while (!buf_is_empty(&ns->input_buffer) && (size_t)ret < count) {
                 buf[ret] = (char)buf_pop_front(&ns->input_buffer);
@@ -282 +271 @@
 static int ns8250_write(ddf_fun_t *fun, char *buf, size_t count)
 {
-        ns8250_t *ns = fun_ns8250(fun);
+        ns8250_t *ns = NS8250(fun);
         size_t idx;
         
@@ -320 +309 @@
 static void ns8250_dev_cleanup(ns8250_t *ns)
 {
+        if (ns->dev->parent_sess) {
+                async_hangup(ns->dev->parent_sess);
+                ns->dev->parent_sess = NULL;
+        }
 }
 
@@ -329 +322 @@
 static bool ns8250_pio_enable(ns8250_t *ns)
 {
-        ddf_msg(LVL_DEBUG, "ns8250_pio_enable %s", ddf_dev_get_name(ns->dev));
+        ddf_msg(LVL_DEBUG, "ns8250_pio_enable %s", ns->dev->name);
         
         /* Gain control over port's registers. */
@@ -335 +328 @@
             (void **) &ns->port)) {
                 ddf_msg(LVL_ERROR, "Cannot map the port %#" PRIx32
-                    " for device %s.", ns->io_addr, ddf_dev_get_name(ns->dev));
+                    " for device %s.", ns->io_addr, ns->dev->name);
                 return false;
         }
@@ -351 +344 @@
 static bool ns8250_dev_probe(ns8250_t *ns)
 {
-        ddf_msg(LVL_DEBUG, "ns8250_dev_probe %s", ddf_dev_get_name(ns->dev));
+        ddf_msg(LVL_DEBUG, "ns8250_dev_probe %s", ns->dev->name);
         
         bool res = true;
@@ -371 +364 @@
         if (!res) {
                 ddf_msg(LVL_DEBUG, "Device %s is not present.",
-                    ddf_dev_get_name(ns->dev));
+                    ns->dev->name);
         }
         
@@ -384 +377 @@
 static int ns8250_dev_initialize(ns8250_t *ns)
 {
-        async_sess_t *parent_sess;
+        ddf_msg(LVL_DEBUG, "ns8250_dev_initialize %s", ns->dev->name);
+        
         int ret = EOK;
-        
-        ddf_msg(LVL_DEBUG, "ns8250_dev_initialize %s", ddf_dev_get_name(ns->dev));
         
         hw_resource_list_t hw_resources;
@@ -393 +385 @@
         
         /* Connect to the parent's driver. */
-        parent_sess = ddf_dev_parent_sess_create(ns->dev, EXCHANGE_SERIALIZE);
-        if (parent_sess == NULL) {
+        ns->dev->parent_sess = devman_parent_device_connect(EXCHANGE_SERIALIZE,
+            ns->dev->handle, IPC_FLAG_BLOCKING);
+        if (!ns->dev->parent_sess) {
                 ddf_msg(LVL_ERROR, "Failed to connect to parent driver of "
-                    "device %s.", ddf_dev_get_name(ns->dev));
+                    "device %s.", ns->dev->name);
                 ret = ENOENT;
                 goto failed;
@@ -402 +395 @@
         
         /* Get hw resources. */
-        ret = hw_res_get_resource_list(parent_sess, &hw_resources);
+        ret = hw_res_get_resource_list(ns->dev->parent_sess, &hw_resources);
         if (ret != EOK) {
                 ddf_msg(LVL_ERROR, "Failed to get HW resources for device "
-                    "%s.", ddf_dev_get_name(ns->dev));
+                    "%s.", ns->dev->name);
                 goto failed;
         }
@@ -421 +414 @@
                         irq = true;
                         ddf_msg(LVL_NOTE, "Device %s was asigned irq = 0x%x.",
-                            ddf_dev_get_name(ns->dev), ns->irq);
+                            ns->dev->name, ns->irq);
                         break;
                         
@@ -428 +421 @@
                         if (res->res.io_range.size < REG_COUNT) {
                                 ddf_msg(LVL_ERROR, "I/O range assigned to "
-                                    "device %s is too small.", ddf_dev_get_name(ns->dev));
+                                    "device %s is too small.", ns->dev->name);
                                 ret = ELIMIT;
                                 goto failed;
@@ -434 +427 @@
                         ioport = true;
                         ddf_msg(LVL_NOTE, "Device %s was asigned I/O address = "
-                            "0x%x.", ddf_dev_get_name(ns->dev), ns->io_addr);
+                            "0x%x.", ns->dev->name, ns->io_addr);
                         break;
                         
@@ -444 +437 @@
         if (!irq || !ioport) {
                 ddf_msg(LVL_ERROR, "Missing HW resource(s) for device %s.",
-                    ddf_dev_get_name(ns->dev));
+                    ns->dev->name);
                 ret = ENOENT;
                 goto failed;
@@ -467 +460 @@
 {
         /* Interrupt when data received. */
-        pio_write_8(&regs->ier, NS8250_IER_RXREADY | NS8250_IER_RXSTATUS);
+        pio_write_8(&regs->ier, NS8250_IER_RXREADY);
         pio_write_8(&regs->mcr, NS8250_MCR_DTR | NS8250_MCR_RTS 
             | NS8250_MCR_OUT2);
@@ -506 +499 @@
         async_exchange_end(exch);
 
-        /* Read LSR to clear possible previous LSR interrupt */
-        pio_read_8(&ns->regs->lsr);
-
         /* Enable interrupt on the serial port. */
         ns8250_port_interrupts_enable(ns->regs);
@@ -612 +602 @@
         *parity = ((val >> NS8250_LCR_PARITY) & 7);
         
-        /* Silence warnings */
-        *word_length = 0;
-
         switch (val & 3) {
         case WORD_LENGTH_5:
@@ -708 +695 @@
         /* 8 bits, no parity, two stop bits. */
         ns8250_port_set_com_props(ns->regs, SERIAL_NO_PARITY, 8, 2);
-        /*
-         * Enable FIFO, clear them, with 4-byte threshold for greater
-         * reliability.
-         */
+        /* 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_RXFIFORESET | NS8250_FCR_TXFIFORESET 
+            | NS8250_FCR_RXTRIGGERLOW | NS8250_FCR_RXTRIGGERHI);
         /*
          * RTS/DSR set (Request to Send and Data Terminal Ready lines enabled),
@@ -747 +731 @@
         bool cont = true;
         
-        fibril_mutex_lock(&ns->mutex);
         while (cont) {
+                fibril_mutex_lock(&ns->mutex);
+                
                 cont = ns8250_received(regs);
                 if (cont) {
                         uint8_t val = ns8250_read_8(regs);
                         
-                        if (ns->client_connections > 0) {
-                                bool buf_was_empty = buf_is_empty(&ns->input_buffer);
+                        if (ns->client_connected) {
                                 if (!buf_push_back(&ns->input_buffer, val)) {
                                         ddf_msg(LVL_WARN, "Buffer overflow on "
-                                            "%s.", ddf_dev_get_name(ns->dev));
-                                        break;
+                                            "%s.", ns->dev->name);
                                 } else {
                                         ddf_msg(LVL_DEBUG2, "Character %c saved "
                                             "to the buffer of %s.",
-                                            val, ddf_dev_get_name(ns->dev));
-                                        if (buf_was_empty)
-                                                fibril_condvar_broadcast(&ns->input_buffer_available);
+                                            val, ns->dev->name);
                                 }
                         }
                 }
-        }
-        fibril_mutex_unlock(&ns->mutex);
-        fibril_yield();
+                
+                fibril_mutex_unlock(&ns->mutex);
+                fibril_yield();
+        }
 }
 
 /** The interrupt handler.
  *
- * The serial port is initialized to interrupt when some data come or line
- * status register changes, so the interrupt is handled by reading the incoming
- * data and reading the line status register.
+ * The serial port is initialized to interrupt when some data come, so the
+ * interrupt is handled by reading the incomming data.
  *
  * @param dev           The serial port device.
@@ -784 +765 @@
     ipc_call_t *icall)
 {
-        ns8250_t *ns = dev_ns8250(dev);
-
-        uint8_t iir = pio_read_8(&ns->regs->iid);
-        if ((iir & NS8250_IID_CAUSE_MASK) == NS8250_IID_CAUSE_RXSTATUS) {
-                uint8_t lsr = pio_read_8(&ns->regs->lsr);
-                if (lsr & NS8250_LSR_OE) {
-                        ddf_msg(LVL_WARN, "Overrun error on %s", ddf_dev_get_name(ns->dev));
-                }
-        }
-        
-        ns8250_read_from_device(ns);
+        ns8250_read_from_device(NS8250_FROM_DEV(dev));
 }
 
@@ -830 +801 @@
         
         ddf_msg(LVL_DEBUG, "ns8250_dev_add %s (handle = %d)",
-            ddf_dev_get_name(dev), (int) ddf_dev_get_handle(dev));
+            dev->name, (int) dev->handle);
         
         /* Allocate soft-state for the device */
@@ -840 +811 @@
         
         fibril_mutex_initialize(&ns->mutex);
-        fibril_condvar_initialize(&ns->input_buffer_available);
         ns->dev = dev;
         
@@ -885 +855 @@
         
         /* Set device operations. */
-        ddf_fun_set_ops(fun, &ns8250_dev_ops);
+        fun->ops = &ns8250_dev_ops;
         rc = ddf_fun_bind(fun);
         if (rc != EOK) {
@@ -897 +867 @@
         
         ddf_msg(LVL_NOTE, "Device %s successfully initialized.",
-            ddf_dev_get_name(dev));
+            dev->name);
         
         return EOK;
@@ -910 +880 @@
 static int ns8250_dev_remove(ddf_dev_t *dev)
 {
-        ns8250_t *ns = dev_ns8250(dev);
+        ns8250_t *ns = NS8250_FROM_DEV(dev);
         int rc;
         
         fibril_mutex_lock(&ns->mutex);
-                if (ns->client_connections > 0) {
+        if (ns->client_connected) {
                 fibril_mutex_unlock(&ns->mutex);
                 return EBUSY;
@@ -944 +914 @@
 static int ns8250_open(ddf_fun_t *fun)
 {
-        ns8250_t *ns = fun_ns8250(fun);
+        ns8250_t *ns = NS8250(fun);
         int res;
         
         fibril_mutex_lock(&ns->mutex);
-        if (ns->removed) {
+        if (ns->client_connected) {
+                res = ELIMIT;
+        } else if (ns->removed) {
                 res = ENXIO;
         } else {
                 res = EOK;
-                ns->client_connections++;
+                ns->client_connected = true;
         }
         fibril_mutex_unlock(&ns->mutex);
@@ -968 +940 @@
 static void ns8250_close(ddf_fun_t *fun)
 {
-        ns8250_t *data = fun_ns8250(fun);
+        ns8250_t *data = (ns8250_t *) fun->dev->driver_data;
         
         fibril_mutex_lock(&data->mutex);
         
-        assert(data->client_connections > 0);
-        
-        if (!(--data->client_connections))
-                buf_clear(&data->input_buffer);
+        assert(data->client_connected);
+        
+        data->client_connected = false;
+        buf_clear(&data->input_buffer);
         
         fibril_mutex_unlock(&data->mutex);
@@ -993 +965 @@
     unsigned int *word_length, unsigned int* stop_bits)
 {
-        ns8250_t *data = dev_ns8250(dev);
+        ns8250_t *data = (ns8250_t *) dev->driver_data;
         ns8250_regs_t *regs = data->regs;
         
@@ -1024 +996 @@
             stop_bits);
         
-        ns8250_t *data = dev_ns8250(dev);
+        ns8250_t *data = (ns8250_t *) dev->driver_data;
         ns8250_regs_t *regs = data->regs;
         int ret;
@@ -1053 +1025 @@
         switch (method) {
         case SERIAL_GET_COM_PROPS:
-                ns8250_get_props(ddf_fun_get_dev(fun), &baud_rate, &parity, &word_length,
+                ns8250_get_props(fun->dev, &baud_rate, &parity, &word_length,
                     &stop_bits);
                 async_answer_4(callid, EOK, baud_rate, parity, word_length,
@@ -1064 +1036 @@
                 word_length = IPC_GET_ARG3(*call);
                 stop_bits = IPC_GET_ARG4(*call);
-                ret = ns8250_set_props(ddf_fun_get_dev(fun), baud_rate, parity, word_length,
+                ret = ns8250_set_props(fun->dev, baud_rate, parity, word_length,
                     stop_bits);
                 async_answer_0(callid, ret);
@@ -1081 +1053 @@
 static void ns8250_init(void)
 {
-        ddf_log_init(NAME);
+        ddf_log_init(NAME, LVL_ERROR);
         
         ns8250_dev_ops.open = &ns8250_open;