Changeset 95c675b in mainline for uspace/drv/bus/pci/pciintel/pci.c

Timestamp:

2017-10-17T13:11:35Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline

File:

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

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);
-        pci_fun_t *dev_data = pci_fun(fnode);
-        
-        size_t i = 0;
-        hw_resource_list_t *res = &dev_data->hw_resources;
-        for (; 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;
+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 true;
+        return false;
+}
+
+static int pciintel_enable_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_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);
 }
 
@@ -187 +211 @@
         .get_resource_list = &pciintel_get_resources,
         .enable_interrupt = &pciintel_enable_interrupt,
+        .disable_interrupt = &pciintel_disable_interrupt,
+        .clear_interrupt = &pciintel_clear_interrupt,
 };
 
@@ -683 +709 @@
         bus->dnode = dnode;
         
-        sess = ddf_dev_parent_sess_create(dnode);
+        sess = ddf_dev_parent_sess_get(dnode);
         if (sess == NULL) {
                 ddf_msg(LVL_ERROR, "pci_dev_add failed to connect to the "