Changeset 95c675b in mainline for uspace/drv/block/ddisk/ddisk.c

Timestamp:

2017-10-17T13:11:35Z (8 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/block/ddisk/ddisk.c (modified) (5 diffs)

uspace/drv/block/ddisk/ddisk.c

@@ -112 +112 @@
         ddisk_regs_t *ddisk_regs;
 
+        int irq_cap;
+
         bd_srvs_t bds;
 } ddisk_t;
@@ -286 +288 @@
         int rc;
 
-        parent_sess = ddf_dev_parent_sess_create(dev);
+        parent_sess = ddf_dev_parent_sess_get(dev);
         if (parent_sess == NULL)
                 return ENOMEM;
@@ -447 +449 @@
         ddisk->bds.sarg = ddisk;
 
+        ddisk->irq_cap = -1;
+
         /*
          * Enable access to ddisk's PIO registers.
@@ -499 +503 @@
         ddisk_irq_commands[0].addr = (void *) &res_phys->status;
         ddisk_irq_commands[3].addr = (void *) &res_phys->command;
-        rc = register_interrupt_handler(dev, ddisk->ddisk_res.irq,
+        ddisk->irq_cap = register_interrupt_handler(dev, ddisk->ddisk_res.irq,
             ddisk_irq_handler, &ddisk_irq_code);
-        if (rc != EOK) {
+        if (ddisk->irq_cap < 0) {
+                rc = ddisk->irq_cap;
                 ddf_msg(LVL_ERROR, "Failed to register interrupt handler.");
                 goto error;
@@ -541 +546 @@
         }
 
-        unregister_interrupt_handler(ddisk->dev, ddisk->ddisk_res.irq);
+        unregister_interrupt_handler(ddisk->dev, ddisk->irq_cap);
         
         rc = pio_disable(ddisk->ddisk_regs, sizeof(ddisk_regs_t));