Changeset cccd60c3 in mainline for uspace/drv/bus

Timestamp:

2017-10-10T06:51:02Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c46bfbc

Parents:

2bdf92a5

Message:

hw_res_enable_interrupt should allow enabling individual interrupts.

Location:

uspace/drv/bus

Files:

• isa/isa.c (modified) (1 diff)
• pci/pciintel/pci.c (modified) (1 diff)

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 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);
+        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) {
-                        int rc = irc_enable_interrupt(
-                            res->resources[i].res.interrupt.irq);
-
-                        if (rc != EOK)
-                                return false;
-                }
-        }
-
-        return true;
+                if (res->resources[i].type == INTERRUPT &&
+                    res->resources[i].res.interrupt.irq == irq) {
+                        found = true;
+                        break;
+                }
+        }
+
+        if (!found)
+                return EINVAL;
+
+        return irc_enable_interrupt(irq);
 }
 

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

@@ -99 +99 @@
 }
 
-static bool pciintel_enable_interrupt(ddf_fun_t *fnode)
-{
-        /* This is an old ugly way */
-        assert(fnode);
+static int pciintel_enable_interrupt(ddf_fun_t *fnode, int irq)
+{
         pci_fun_t *dev_data = pci_fun(fnode);
         
-        size_t i = 0;
+        size_t i;
         hw_resource_list_t *res = &dev_data->hw_resources;
-        for (; i < res->count; i++) {
+        bool found = false;
+        
+        found = false;
+        for (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;
+                        found = true;
+                        break;
                 }
         }
         
-        return true;
+        if (!found)
+                return EINVAL;
+        
+        return irc_enable_interrupt(irq);
 }