Changeset 60744cb in mainline for uspace/drv/audio

Timestamp:

2024-05-17T17:51:56Z (2 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master, topic/fix-logger-deadlock

Children:

1801005

Parents:

646849b3

Message:

Let driver specify any argument to IRQ handler

This allows the driver to register a single handler for multiple
interrupts and still distinguish between them. It also removes
the extra step of having to get softstate from ddf_dev_t.

Location:

uspace/drv/audio

Files:

• hdaudio/hdaudio.c (modified) (3 diffs)
• sb16/main.c (modified) (2 diffs)

uspace/drv/audio/hdaudio/hdaudio.c

@@ -58 +58 @@
 static errno_t hda_fun_offline(ddf_fun_t *fun);
 
-static void hdaudio_interrupt(ipc_call_t *, ddf_dev_t *);
+static void hdaudio_interrupt(ipc_call_t *, void *);
 
 static driver_ops_t driver_ops = {
@@ -266 +266 @@
         cap_irq_handle_t irq_cap;
         rc = register_interrupt_handler(dev, res.irqs.irqs[0],
-            hdaudio_interrupt, &irq_code, &irq_cap);
+            hdaudio_interrupt, (void *)hda, &irq_code, &irq_cap);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed registering interrupt handler: %s",
@@ -377 +377 @@
 }
 
-static void hdaudio_interrupt(ipc_call_t *icall, ddf_dev_t *dev)
-{
-        hda_t *hda = (hda_t *)ddf_dev_data_get(dev);
+/** HD Audio interrupt handler.
+ *
+ * @param icall IRQ event notification
+ * @param arg Argument (hda_t *)
+ */
+static void hdaudio_interrupt(ipc_call_t *icall, void *arg)
+{
+        hda_t *hda = (hda_t *)arg;
 
         if (0)

uspace/drv/audio/sb16/main.c

@@ -76 +76 @@
 }
 
-static void irq_handler(ipc_call_t *call, ddf_dev_t *dev)
-{
-        sb16_t *sb16_dev = ddf_dev_data_get(dev);
+/** SB16 IRQ handler.
+ *
+ * @param call IRQ event notification
+ * @param arg Argument (sb16_t *)
+ */
+static void irq_handler(ipc_call_t *call, void *arg)
+{
+        sb16_t *sb16_dev = (sb16_t *)arg;
         sb16_interrupt(sb16_dev);
 }
@@ -124 +129 @@
 
         rc = register_interrupt_handler(device, irq, irq_handler,
-            &irq_code, &irq_cap);
+            (void *)soft_state, &irq_code, &irq_cap);
         if (rc != EOK) {
                 ddf_log_error("Failed to register irq handler: %s.",