Changeset d51838f in mainline for uspace/drv/bus

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/bus

Files:

• isa/isa.c (modified) (2 diffs)
• pci/pciintel/pci.c (modified) (2 diffs)

uspace/drv/bus/isa/isa.c

@@ -115 +115 @@
 }
 
-static int isa_fun_enable_interrupt(ddf_fun_t *fnode, int irq)
-{
-        isa_fun_t *fun = isa_fun(fnode);
+static bool isa_fun_owns_interrupt(isa_fun_t *fun, int irq)
+{
         const hw_resource_list_t *res = &fun->hw_resources;
-        bool found;
 
         /* Check that specified irq really belongs to the function */
-        found = false;
         for (size_t i = 0; i < res->count; ++i) {
                 if (res->resources[i].type == INTERRUPT &&
                     res->resources[i].res.interrupt.irq == irq) {
-                        found = true;
-                        break;
-                }
-        }
-
-        if (!found)
+                        return true;
+                }
+        }
+
+        return false;
+}
+
+static int isa_fun_enable_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_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,

uspace/drv/bus/pci/pciintel/pci.c

@@ -99 +99 @@
 }
 
+static int pciintel_fun_owns_interrupt(pci_fun_t *fun, int irq)
+{
+        size_t i;
+        hw_resource_list_t *res = &fun->hw_resources;
+        
+        for (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 pciintel_enable_interrupt(ddf_fun_t *fnode, int irq)
 {
-        pci_fun_t *dev_data = pci_fun(fnode);
-        
-        size_t i;
-        hw_resource_list_t *res = &dev_data->hw_resources;
-        bool found = false;
-        
-        found = false;
-        for (i = 0; i < res->count; i++) {
-                if (res->resources[i].type == INTERRUPT) {
-                        found = true;
-                        break;
-                }
-        }
-        
-        if (!found)
+        pci_fun_t *fun = pci_fun(fnode);
+        
+        if (!pciintel_fun_owns_interrupt(fun, irq))
                 return EINVAL;
-        
+
         return irc_enable_interrupt(irq);
+}
+
+static int pciintel_disable_interrupt(ddf_fun_t *fnode, int irq)
+{
+        pci_fun_t *fun = pci_fun(fnode);
+        
+        if (!pciintel_fun_owns_interrupt(fun, irq))
+                return EINVAL;
+
+        return irc_disable_interrupt(irq);
+}
+
+static int pciintel_clear_interrupt(ddf_fun_t *fnode, int irq)
+{
+        pci_fun_t *fun = pci_fun(fnode);
+        
+        if (!pciintel_fun_owns_interrupt(fun, irq))
+                return EINVAL;
+
+        return irc_clear_interrupt(irq);
 }
 
@@ -188 +211 @@
         .get_resource_list = &pciintel_get_resources,
         .enable_interrupt = &pciintel_enable_interrupt,
+        .disable_interrupt = &pciintel_disable_interrupt,
+        .clear_interrupt = &pciintel_clear_interrupt,
 };