Changeset 646849b3 in mainline for uspace/lib

Timestamp:

2024-05-17T12:25:26Z (18 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

60744cb

Parents:

59c0f478

git-author:

Jiri Svoboda <jiri@…> (2024-05-16 19:25:07)

git-committer:

Jiri Svoboda <jiri@…> (2024-05-17 12:25:26)

Message:

Handle both IDE channels in the same driver instance

We need to work around libdrv not allowing us to distinguish
between two interrupts registered with the same device.

Location:

uspace/lib

Files:

• ata/src/ata.c (modified) (2 diffs)
• drv/generic/interrupt.c (modified) (2 diffs)
• drv/include/ddf/interrupt.h (modified) (2 diffs)

uspace/lib/ata/src/ata.c

@@ -446 +446 @@
 static errno_t ata_bd_init_irq(ata_channel_t *chan)
 {
+        if (!chan->params.have_irq)
+                return EOK;
+
         return chan->params.irq_enable(chan->params.arg);
 }
@@ -452 +455 @@
 static void ata_bd_fini_irq(ata_channel_t *chan)
 {
+        if (!chan->params.have_irq)
+                return;
+
         (void)chan->params.irq_disable(chan->params.arg);
 }

uspace/lib/drv/generic/interrupt.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2024 Jiri Svoboda
  * Copyright (c) 2010 Lenka Trochtova
  * All rights reserved.
@@ -50 +51 @@
 }
 
+errno_t register_interrupt_handler_arg(ddf_dev_t *dev, int irq,
+    interrupt_handler_t *handler, void *arg, const irq_code_t *irq_code,
+    cap_irq_handle_t *handle)
+{
+        (void)dev;
+        return async_irq_subscribe(irq, (async_notification_handler_t) handler,
+            arg, irq_code, handle);
+}
+
 errno_t unregister_interrupt_handler(ddf_dev_t *dev, cap_irq_handle_t handle)
 {

uspace/lib/drv/include/ddf/interrupt.h

@@ -1 +1 @@
 /*
+ * Copyright (c) 2024 Jiri Svoboda
  * Copyright (c) 2010 Lenka Trochtova
  * All rights reserved.
@@ -52 +53 @@
 extern errno_t register_interrupt_handler(ddf_dev_t *, int, interrupt_handler_t *,
     const irq_code_t *, cap_irq_handle_t *);
+extern errno_t register_interrupt_handler_arg(ddf_dev_t *, int,
+    interrupt_handler_t *, void *, const irq_code_t *, cap_irq_handle_t *);
 extern errno_t unregister_interrupt_handler(ddf_dev_t *, cap_irq_handle_t);