Changes in uspace/drv/block/ahci/ahci.c [f9b2cb4c:d51838f] in mainline

File:

• uspace/drv/block/ahci/ahci.c (modified) (4 diffs)

uspace/drv/block/ahci/ahci.c

@@ -36 +36 @@
 #include <ddf/interrupt.h>
 #include <ddf/log.h>
+#include <device/hw_res.h>
 #include <device/hw_res_parsed.h>
 #include <pci_dev_iface.h>
-#include <irc.h>
 #include <ahci_iface.h>
 #include "ahci.h"
@@ -1140 +1140 @@
         
         /* Connect to parent device */
-        ahci->parent_sess = ddf_dev_parent_sess_create(dev);
+        ahci->parent_sess = ddf_dev_parent_sess_get(dev);
         if (ahci->parent_sess == NULL)
                 return NULL;
@@ -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 = hw_res_enable_interrupt(ahci->parent_sess,
+            hw_res_parsed.irqs.irqs[0]);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed enable interupt.");
@@ -1202 +1203 @@
         
 error_enable_interrupt:
-        unregister_interrupt_handler(dev, hw_res_parsed.irqs.irqs[0]);
+        unregister_interrupt_handler(dev, irq_cap);
         
 error_register_interrupt_handler: