Changeset e9d15d9 in mainline for uspace/drv/block

Timestamp:

2017-08-18T21:15:26Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

24abb85d

Parents:

1c85bae

Message:

Turn IRQ structures into kernel objects

ipc_irq_subscribe() now returns a capability for the underlying IRQ kernel
object. ipc_irq_unsubscribe() can now be done only with a valid IRQ capability.

Location:

uspace/drv/block

Files:

• ahci/ahci.c (modified) (2 diffs)
• ddisk/ddisk.c (modified) (4 diffs)

uspace/drv/block/ahci/ahci.c

@@ -1185 +1185 @@
         ct.ranges = ahci_ranges;
         
-        int rc = register_interrupt_handler(dev, hw_res_parsed.irqs.irqs[0],
-            ahci_interrupt, &ct);
-        if (rc != EOK) {
+        int irq_cap = register_interrupt_handler(dev,
+            hw_res_parsed.irqs.irqs[0], ahci_interrupt, &ct);
+        if (irq_cap < 0) {
                 ddf_msg(LVL_ERROR, "Failed registering interrupt handler.");
                 goto error_register_interrupt_handler;
         }
         
-        rc = irc_enable_interrupt(hw_res_parsed.irqs.irqs[0]);
+        int rc = irc_enable_interrupt(hw_res_parsed.irqs.irqs[0]);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed enable interupt.");
@@ -1202 +1202 @@
         
 error_enable_interrupt:
-        unregister_interrupt_handler(dev, hw_res_parsed.irqs.irqs[0]);
+        unregister_interrupt_handler(dev, irq_cap);
         
 error_register_interrupt_handler:

uspace/drv/block/ddisk/ddisk.c

@@ -112 +112 @@
         ddisk_regs_t *ddisk_regs;
 
+        int irq_cap;
+
         bd_srvs_t bds;
 } ddisk_t;
@@ -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));