Changes in uspace/drv/bus/isa/isa.c [ce04ea44:d51838f] in mainline

File:

• uspace/drv/bus/isa/isa.c (modified) (3 diffs)

uspace/drv/bus/isa/isa.c

@@ -115 +115 @@
 }
 
-static bool isa_fun_enable_interrupt(ddf_fun_t *fnode)
-{
-        /* This is an old ugly way, copied from pci driver */
-        assert(fnode);
+static bool isa_fun_owns_interrupt(isa_fun_t *fun, int irq)
+{
+        const hw_resource_list_t *res = &fun->hw_resources;
+
+        /* Check that specified irq really belongs to the function */
+        for (size_t i = 0; i < res->count; ++i) {
+                if (res->resources[i].type == INTERRUPT &&
+                    res->resources[i].res.interrupt.irq == irq) {
+                        return true;
+                }
+        }
+
+        return false;
+}
+
+static int isa_fun_enable_interrupt(ddf_fun_t *fnode, int irq)
+{
         isa_fun_t *fun = isa_fun(fnode);
-        assert(fun);
-
-        const hw_resource_list_t *res = &fun->hw_resources;
-        assert(res);
-        for (size_t i = 0; i < res->count; ++i) {
-                if (res->resources[i].type == INTERRUPT) {
-                        int rc = irc_enable_interrupt(
-                            res->resources[i].res.interrupt.irq);
-
-                        if (rc != EOK)
-                                return false;
-                }
-        }
-
-        return true;
+
+        if (!isa_fun_owns_interrupt(fun, irq))
+                return EINVAL;
+
+        return irc_enable_interrupt(irq);
+}
+
+static int isa_fun_disable_interrupt(ddf_fun_t *fnode, int irq)
+{
+        isa_fun_t *fun = isa_fun(fnode);
+
+        if (!isa_fun_owns_interrupt(fun, irq))
+                return EINVAL;
+
+        return irc_disable_interrupt(irq);
+}
+
+static int isa_fun_clear_interrupt(ddf_fun_t *fnode, int irq)
+{
+        isa_fun_t *fun = isa_fun(fnode);
+
+        if (!isa_fun_owns_interrupt(fun, irq))
+                return EINVAL;
+
+        return irc_clear_interrupt(irq);
 }
 
@@ -185 +208 @@
         .get_resource_list = isa_fun_get_resources,
         .enable_interrupt = isa_fun_enable_interrupt,
+        .disable_interrupt = isa_fun_disable_interrupt,
+        .clear_interrupt = isa_fun_clear_interrupt,
         .dma_channel_setup = isa_fun_setup_dma,
         .dma_channel_remain = isa_fun_remain_dma,
@@ -643 +668 @@
         list_initialize(&isa->functions);
 
-        sess = ddf_dev_parent_sess_create(dev);
+        sess = ddf_dev_parent_sess_get(dev);
         if (sess == NULL) {
                 ddf_msg(LVL_ERROR, "isa_dev_add failed to connect to the "