Changes in uspace/drv/audio/sb16/main.c [f9b2cb4c:cccd60c3] in mainline

File:

• uspace/drv/audio/sb16/main.c (modified) (9 diffs)

uspace/drv/audio/sb16/main.c

@@ -37 +37 @@
 #include <ddf/log.h>
 #include <device/hw_res_parsed.h>
-#include <devman.h>
 #include <assert.h>
 #include <stdio.h>
@@ -51 +50 @@
 static int sb_get_res(ddf_dev_t *device, addr_range_t **pp_sb_regs,
     addr_range_t **pp_mpu_regs, int *irq, int *dma8, int *dma16);
-static int sb_enable_interrupts(ddf_dev_t *device);
+static int sb_enable_interrupt(ddf_dev_t *device, int irq);
 
 static driver_ops_t sb_driver_ops = {
@@ -94 +93 @@
         irq_cmd_t irq_cmds[irq_cmd_count];
         irq_pio_range_t irq_ranges[1];
+        int irq_cap;
 
         sb16_t *soft_state = ddf_dev_data_alloc(device, sizeof(sb16_t));
@@ -123 +123 @@
         };
 
-        rc = register_interrupt_handler(device, irq, irq_handler, &irq_code);
-        if (rc != EOK) {
+        irq_cap = register_interrupt_handler(device, irq, irq_handler,
+            &irq_code);
+        if (irq_cap < 0) {
+                rc = irq_cap;
                 ddf_log_error("Failed to register irq handler: %s.",
                     str_error(rc));
@@ -132 +134 @@
         handler_regd = true;
 
-        rc = sb_enable_interrupts(device);
+        rc = sb_enable_interrupt(device, irq);
         if (rc != EOK) {
                 ddf_log_error("Failed to enable interrupts: %s.",
@@ -168 +170 @@
 error:
         if (handler_regd)
-                unregister_interrupt_handler(device, irq);
+                unregister_interrupt_handler(device, irq_cap);
         return rc;
 }
@@ -177 +179 @@
         assert(device);
 
-        async_sess_t *parent_sess = devman_parent_device_connect(
-            ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
-        if (!parent_sess)
+        async_sess_t *parent_sess = ddf_dev_parent_sess_get(device);
+        if (parent_sess == NULL)
                 return ENOMEM;
 
@@ -185 +186 @@
         hw_res_list_parsed_init(&hw_res);
         const int ret = hw_res_get_list_parsed(parent_sess, &hw_res, 0);
-        async_hangup(parent_sess);
         if (ret != EOK) {
                 return ret;
@@ -242 +242 @@
 }
 
-int sb_enable_interrupts(ddf_dev_t *device)
-{
-        async_sess_t *parent_sess = devman_parent_device_connect(
-            ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
-        if (!parent_sess)
+static int sb_enable_interrupt(ddf_dev_t *device, int irq)
+{
+        async_sess_t *parent_sess = ddf_dev_parent_sess_get(device);
+        if (parent_sess == NULL)
                 return ENOMEM;
 
-        bool enabled = hw_res_enable_interrupt(parent_sess);
-        async_hangup(parent_sess);
-
-        return enabled ? EOK : EIO;
+        return hw_res_enable_interrupt(parent_sess, irq);
 }