Changes in uspace/drv/block/ddisk/ddisk.c [2fd26bb:f97f5cc2] in 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;
@@ -288 +286 @@
         int rc;
 
-        parent_sess = ddf_dev_parent_sess_get(dev);
+        parent_sess = ddf_dev_parent_sess_create(dev);
         if (parent_sess == NULL)
                 return ENOMEM;
@@ -449 +447 @@
         ddisk->bds.sarg = ddisk;
 
-        ddisk->irq_cap = -1;
-
         /*
          * Enable access to ddisk's PIO registers.
@@ -503 +499 @@
         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,
+        rc = register_interrupt_handler(dev, ddisk->ddisk_res.irq,
             ddisk_irq_handler, &ddisk_irq_code);
-        if (ddisk->irq_cap < 0) {
-                rc = ddisk->irq_cap;
+        if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed to register interrupt handler.");
                 goto error;
@@ -546 +541 @@
         }
 
-        unregister_interrupt_handler(ddisk->dev, ddisk->irq_cap);
+        unregister_interrupt_handler(ddisk->dev, ddisk->ddisk_res.irq);
         
         rc = pio_disable(ddisk->ddisk_regs, sizeof(ddisk_regs_t));