Changeset 071a1ddb in mainline for uspace/drv/block

Timestamp:

2017-12-08T21:17:27Z (8 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

0722869, 569a51a

Parents:

9233e9d

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-08 00:30:18)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-08 21:17:27)

Message:

Return IRQ handles via a separate out parameter in all uspace code.

Location:

uspace/drv/block

Files:

• ahci/ahci.c (modified) (1 diff)
• ddisk/ddisk.c (modified) (1 diff)

uspace/drv/block/ahci/ahci.c

@@ -1184 +1184 @@
         ct.ranges = ahci_ranges;
         
-        int irq_cap = register_interrupt_handler(dev,
-            hw_res_parsed.irqs.irqs[0], ahci_interrupt, &ct);
-        if (irq_cap < 0) {
+        int irq_cap;
+        int rc = register_interrupt_handler(dev,
+            hw_res_parsed.irqs.irqs[0], ahci_interrupt, &ct, &irq_cap);
+        if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed registering interrupt handler.");
                 goto error_register_interrupt_handler;
         }
         
-        int rc = hw_res_enable_interrupt(ahci->parent_sess,
+        rc = hw_res_enable_interrupt(ahci->parent_sess,
             hw_res_parsed.irqs.irqs[0]);
         if (rc != EOK) {

uspace/drv/block/ddisk/ddisk.c

@@ -503 +503 @@
         ddisk_irq_commands[0].addr = (void *) &res_phys->status;
         ddisk_irq_commands[3].addr = (void *) &res_phys->command;
-        ddisk->irq_cap = register_interrupt_handler(dev, ddisk->ddisk_res.irq,
-            ddisk_irq_handler, &ddisk_irq_code);
-        if (ddisk->irq_cap < 0) {
-                rc = ddisk->irq_cap;
+        rc = register_interrupt_handler(dev, ddisk->ddisk_res.irq,
+            ddisk_irq_handler, &ddisk_irq_code, &ddisk->irq_cap);
+        if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed to register interrupt handler.");
                 goto error;