Changes in uspace/drv/char/ns8250/ns8250.c [d51838f:b19e892] in mainline

File:

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

uspace/drv/char/ns8250/ns8250.c

@@ -55 +55 @@
 #include <ops/char_dev.h>
 
+#include <irc.h>
 #include <device/hw_res.h>
 #include <ipc/serial_ctl.h>
@@ -153 +154 @@
         /** DDF function node */
         ddf_fun_t *fun;
-        /** Parent session */
-        async_sess_t *parent_sess;
         /** I/O registers **/
         ns8250_regs_t *regs;
@@ -161 +160 @@
         /** The irq assigned to this device. */
         int irq;
-        /** IRQ capability handle */
-        int irq_cap;
         /** The base i/o address of the devices registers. */
         uintptr_t io_addr;
@@ -383 +380 @@
 static int ns8250_dev_initialize(ns8250_t *ns)
 {
+        async_sess_t *parent_sess;
         int ret = EOK;
         
@@ -390 +388 @@
         memset(&hw_resources, 0, sizeof(hw_resource_list_t));
         
+        /* Connect to the parent's driver. */
+        parent_sess = ddf_dev_parent_sess_create(ns->dev);
+        if (parent_sess == NULL) {
+                ddf_msg(LVL_ERROR, "Failed to connect to parent driver of "
+                    "device %s.", ddf_dev_get_name(ns->dev));
+                ret = ENOENT;
+                goto failed;
+        }
+        
         /* Get hw resources. */
-        ret = hw_res_get_resource_list(ns->parent_sess, &hw_resources);
+        ret = hw_res_get_resource_list(parent_sess, &hw_resources);
         if (ret != EOK) {
                 ddf_msg(LVL_ERROR, "Failed to get HW resources for device "
@@ -478 +485 @@
 {
         /* Enable interrupt using IRC service. */
-        int rc = hw_res_enable_interrupt(ns->parent_sess, ns->irq);
+        int rc = irc_enable_interrupt(ns->irq);
         if (rc != EOK)
                 return EIO;
@@ -771 +778 @@
         
         ns8250_read_from_device(ns);
-        hw_res_clear_interrupt(ns->parent_sess, ns->irq);
+        irc_disable_interrupt(ns->irq);
 }
 
@@ -790 +797 @@
 static inline int ns8250_unregister_interrupt_handler(ns8250_t *ns)
 {
-        return unregister_interrupt_handler(ns->dev, ns->irq_cap);
+        return unregister_interrupt_handler(ns->dev, ns->irq);
 }
 
@@ -821 +828 @@
         ns->dev = dev;
         
-        ns->parent_sess = ddf_dev_parent_sess_get(ns->dev);
-        if (ns->parent_sess == NULL) {
-                ddf_msg(LVL_ERROR, "Failed to connect to parent driver of "
-                    "device %s.", ddf_dev_get_name(ns->dev));
-                rc = EIO;
-                goto fail;
-        }
-        
         rc = ns8250_dev_initialize(ns);
         if (rc != EOK)
@@ -850 +849 @@
         
         /* Register interrupt handler. */
-        ns->irq_cap = ns8250_register_interrupt_handler(ns);
-        if (ns->irq_cap < 0) {
+        if (ns8250_register_interrupt_handler(ns) != EOK) {
                 ddf_msg(LVL_ERROR, "Failed to register interrupt handler.");
                 rc = EADDRNOTAVAIL;