Changeset 60744cb in mainline for uspace/lib

Timestamp:

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

Author:

Jiri Svoboda <jiri@…>

Branches:

master

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/lib

Files:

• drv/generic/interrupt.c (modified) (1 diff)
• drv/include/ddf/interrupt.h (modified) (1 diff)
• usbhost/src/hcd.c (modified) (2 diffs)

uspace/lib/drv/generic/interrupt.c

@@ -44 +44 @@
 
 errno_t register_interrupt_handler(ddf_dev_t *dev, int irq,
-    interrupt_handler_t *handler, const irq_code_t *irq_code,
-    cap_irq_handle_t *handle)
-{
-        return async_irq_subscribe(irq, (async_notification_handler_t) handler,
-            dev, irq_code, handle);
-}
-
-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)

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

@@ -49 +49 @@
  */
 
-typedef void interrupt_handler_t(ipc_call_t *, ddf_dev_t *);
+typedef void interrupt_handler_t(ipc_call_t *, void *);
 
-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,
+extern errno_t register_interrupt_handler(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);

uspace/lib/usbhost/src/hcd.c

@@ -95 +95 @@
  * TODO: Make the bus mechanism less flexible in irq handling and remove the
  * lookup.
- */
-static void irq_handler(ipc_call_t *call, ddf_dev_t *dev)
-{
-        assert(dev);
-        hc_device_t *hcd = dev_to_hcd(dev);
+ *
+ * @param call Interrupt notification
+ * @param arg Argument (hc_device_t *)
+ */
+static void irq_handler(ipc_call_t *call, void *arg)
+{
+        hc_device_t *hcd = (hc_device_t *)arg;
 
         const uint32_t status = ipc_get_arg1(call);
@@ -178 +180 @@
         cap_irq_handle_t ihandle;
         ret = register_interrupt_handler(hcd->ddf_dev, irq, irq_handler,
-            &irq_code, &ihandle);
+            (void *)hcd, &irq_code, &ihandle);
         irq_code_clean(&irq_code);
         if (ret != EOK) {