Changes in uspace/drv/char/ns8250/ns8250.c [56fd7cf:c92e30f] in mainline

File:

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

uspace/drv/char/ns8250/ns8250.c

@@ -58 +58 @@
 #include <ops/char_dev.h>
 
+#include <devman.h>
 #include <ns.h>
+#include <ipc/devman.h>
 #include <ipc/services.h>
 #include <ipc/irc.h>
@@ -125 +127 @@
 #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))
+
+/** 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. */
@@ -179 +187 @@
 } 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 incomming data available on the serial port.
  *
@@ -245 +241 @@
 static int ns8250_read(ddf_fun_t *fun, char *buf, size_t count)
 {
-        ns8250_t *ns = fun_ns8250(fun);
+        ns8250_t *ns = NS8250(fun);
         int ret = 0;
         
@@ -283 +279 @@
 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;
         
@@ -321 +317 @@
 static void ns8250_dev_cleanup(ns8250_t *ns)
 {
+        if (ns->dev->parent_sess) {
+                async_hangup(ns->dev->parent_sess);
+                ns->dev->parent_sess = NULL;
+        }
 }
 
@@ -330 +330 @@
 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. */
@@ -336 +336 @@
             (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;
         }
@@ -352 +352 @@
 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;
@@ -372 +372 @@
         if (!res) {
                 ddf_msg(LVL_DEBUG, "Device %s is not present.",
-                    ddf_dev_get_name(ns->dev));
+                    ns->dev->name);
         }
         
@@ -385 +385 @@
 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;
@@ -394 +393 @@
         
         /* 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;
@@ -403 +403 @@
         
         /* 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;
         }
@@ -422 +422 @@
                         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;
                         
@@ -429 +429 @@
                         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;
@@ -435 +435 @@
                         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;
                         
@@ -445 +445 @@
         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;
@@ -613 +613 @@
         *parity = ((val >> NS8250_LCR_PARITY) & 7);
         
-        /* Silence warnings */
-        *word_length = 0;
-
         switch (val & 3) {
         case WORD_LENGTH_5:
@@ -758 +755 @@
                                 if (!buf_push_back(&ns->input_buffer, val)) {
                                         ddf_msg(LVL_WARN, "Buffer overflow on "
-                                            "%s.", ddf_dev_get_name(ns->dev));
+                                            "%s.", ns->dev->name);
                                         break;
                                 } else {
                                         ddf_msg(LVL_DEBUG2, "Character %c saved "
                                             "to the buffer of %s.",
-                                            val, ddf_dev_get_name(ns->dev));
+                                            val, ns->dev->name);
                                         if (buf_was_empty)
                                                 fibril_condvar_broadcast(&ns->input_buffer_available);
@@ -785 +782 @@
     ipc_call_t *icall)
 {
-        ns8250_t *ns = dev_ns8250(dev);
+        ns8250_t *ns = NS8250_FROM_DEV(dev);
 
         uint8_t iir = pio_read_8(&ns->regs->iid);
@@ -791 +788 @@
                 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));
+                        ddf_msg(LVL_WARN, "Overrun error on %s", ns->dev->name);
                 }
         }
@@ -831 +828 @@
         
         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 */
@@ -886 +883 @@
         
         /* Set device operations. */
-        ddf_fun_set_ops(fun, &ns8250_dev_ops);
+        fun->ops = &ns8250_dev_ops;
         rc = ddf_fun_bind(fun);
         if (rc != EOK) {
@@ -898 +895 @@
         
         ddf_msg(LVL_NOTE, "Device %s successfully initialized.",
-            ddf_dev_get_name(dev));
+            dev->name);
         
         return EOK;
@@ -911 +908 @@
 static int ns8250_dev_remove(ddf_dev_t *dev)
 {
-        ns8250_t *ns = dev_ns8250(dev);
+        ns8250_t *ns = NS8250_FROM_DEV(dev);
         int rc;
         
@@ -945 +942 @@
 static int ns8250_open(ddf_fun_t *fun)
 {
-        ns8250_t *ns = fun_ns8250(fun);
+        ns8250_t *ns = NS8250(fun);
         int res;
         
@@ -971 +968 @@
 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);
@@ -996 +993 @@
     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;
         
@@ -1027 +1024 @@
             stop_bits);
         
-        ns8250_t *data = dev_ns8250(dev);
+        ns8250_t *data = (ns8250_t *) dev->driver_data;
         ns8250_regs_t *regs = data->regs;
         int ret;
@@ -1056 +1053 @@
         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,
@@ -1067 +1064 @@
                 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);