Changeset d51838f in mainline for uspace/drv/char

Timestamp:

2017-10-14T22:49:18Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

75911d24

Parents:

ce732e74

Message:

Let leaf drivers enable/disable/clear interrupts via hw_res instead of directly using irc.

Location:

uspace/drv/char

Files:

• ns8250/ns8250.c (modified) (7 diffs)
• pl050/pl050.c (modified) (2 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>
@@ -154 +153 @@
         /** DDF function node */
         ddf_fun_t *fun;
+        /** Parent session */
+        async_sess_t *parent_sess;
         /** I/O registers **/
         ns8250_regs_t *regs;
@@ -382 +383 @@
 static int ns8250_dev_initialize(ns8250_t *ns)
 {
-        async_sess_t *parent_sess;
         int ret = EOK;
         
@@ -390 +390 @@
         memset(&hw_resources, 0, sizeof(hw_resource_list_t));
         
-        /* Connect to the parent's driver. */
-        parent_sess = ddf_dev_parent_sess_get(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(parent_sess, &hw_resources);
+        ret = hw_res_get_resource_list(ns->parent_sess, &hw_resources);
         if (ret != EOK) {
                 ddf_msg(LVL_ERROR, "Failed to get HW resources for device "
@@ -487 +478 @@
 {
         /* Enable interrupt using IRC service. */
-        int rc = irc_enable_interrupt(ns->irq);
+        int rc = hw_res_enable_interrupt(ns->parent_sess, ns->irq);
         if (rc != EOK)
                 return EIO;
@@ -780 +771 @@
         
         ns8250_read_from_device(ns);
-        irc_clear_interrupt(ns->irq);
+        hw_res_clear_interrupt(ns->parent_sess, ns->irq);
 }
 
@@ -829 +820 @@
         fibril_condvar_initialize(&ns->input_buffer_available);
         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);

uspace/drv/char/pl050/pl050.c

@@ -38 +38 @@
 #include <ddf/interrupt.h>
 #include <ddf/log.h>
+#include <device/hw_res.h>
 #include <device/hw_res_parsed.h>
 #include <io/chardev_srv.h>
-#include <irc.h>
 
 #include "pl050_hw.h"
@@ -221 +221 @@
         }
 
-        rc = irc_enable_interrupt(res.irqs.irqs[0]);
+        rc = hw_res_enable_interrupt(pl050->parent_sess, res.irqs.irqs[0]);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed enabling interrupt. (%d)", rc);