Changeset 60744cb in mainline for uspace/drv/char

Timestamp:

2024-05-17T17:51:56Z (22 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/drv/char

Files:

• i8042/i8042.c (modified) (5 diffs)
• i8042/i8042.h (modified) (2 diffs)
• ns8250/ns8250.c (modified) (2 diffs)
• pl050/pl050.c (modified) (2 diffs)

uspace/drv/char/i8042/i8042.c

@@ -123 +123 @@
  * Write new data to the corresponding buffer.
  *
- * @param call pointerr to call data.
- * @param dev  Device that caued the interrupt.
- *
- */
-static void i8042_irq_handler(ipc_call_t *call, ddf_dev_t *dev)
-{
-        i8042_t *controller = ddf_dev_data_get(dev);
+ * @param call Pointer to call data.
+ * @param arg  Argument (i8042_t *)
+ */
+static void i8042_irq_handler(ipc_call_t *call, void *arg)
+{
+        i8042_t *controller = (i8042_t *)arg;
         errno_t rc;
 
@@ -147 +146 @@
         fibril_condvar_broadcast(&port->buf_cv);
 
-        async_sess_t *parent_sess = ddf_dev_parent_sess_get(dev);
+        async_sess_t *parent_sess = ddf_dev_parent_sess_get(controller->dev);
         hw_res_clear_interrupt(parent_sess, port->irq);
 }
@@ -178 +177 @@
         bool aux_bound = false;
 
+        dev->dev = ddf_dev;
+
         if (regs->size < sizeof(i8042_regs_t)) {
                 rc = EINVAL;
@@ -288 +289 @@
         cap_irq_handle_t kbd_ihandle;
         rc = register_interrupt_handler(ddf_dev, irq_kbd,
-            i8042_irq_handler, &irq_code, &kbd_ihandle);
+            i8042_irq_handler, (void *)dev, &irq_code, &kbd_ihandle);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed set handler for kbd: %s.",
@@ -297 +298 @@
         cap_irq_handle_t mouse_ihandle;
         rc = register_interrupt_handler(ddf_dev, irq_mouse,
-            i8042_irq_handler, &irq_code, &mouse_ihandle);
+            i8042_irq_handler, (void *)dev, &irq_code, &mouse_ihandle);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed set handler for mouse: %s.",

uspace/drv/char/i8042/i8042.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * Copyright (c) 2006 Josef Cejka
  * Copyright (c) 2011 Jan Vesely
@@ -82 +82 @@
 /** i8042 Controller. */
 typedef struct i8042 {
+        /** DDF device */
+        ddf_dev_t *dev;
         /** I/O registers. */
         i8042_regs_t *regs;

uspace/drv/char/ns8250/ns8250.c

@@ -783 +783 @@
  * data and reading the line status register.
  *
- * @param dev The serial port device.
- *
- */
-static inline void ns8250_interrupt_handler(ipc_call_t *icall, ddf_dev_t *dev)
-{
-        ns8250_t *ns = dev_ns8250(dev);
+ * @pram icall IRQ event notificatoin
+ * @param arg Argument (ns8250_t *)
+ */
+static inline void ns8250_interrupt_handler(ipc_call_t *icall, void *arg)
+{
+        ns8250_t *ns = (ns8250_t *)arg;
         uint8_t iir = pio_read_8(&ns->regs->iid);
         if ((iir & NS8250_IID_CAUSE_MASK) == NS8250_IID_CAUSE_RXSTATUS) {
@@ -809 +809 @@
 {
         return register_interrupt_handler(ns->dev, ns->irq,
-            ns8250_interrupt_handler, NULL, ihandle);
+            ns8250_interrupt_handler, (void *)ns, NULL, ihandle);
 }
 

uspace/drv/char/pl050/pl050.c

@@ -143 +143 @@
 }
 
-static void pl050_interrupt(ipc_call_t *call, ddf_dev_t *dev)
-{
-        pl050_t *pl050 = (pl050_t *)ddf_dev_data_get(dev);
+/** PL050 interrupt handler
+ *
+ * @param call IRQ event notification
+ * @param arg Argument (pl050_t *)
+ */
+static void pl050_interrupt(ipc_call_t *call, void *arg)
+{
+        pl050_t *pl050 = (pl050_t *)arg;
         size_t nidx;
 
@@ -220 +225 @@
         cap_irq_handle_t ihandle;
         rc = register_interrupt_handler(pl050->dev,
-            res.irqs.irqs[0], pl050_interrupt, &pl050_irq_code, &ihandle);
+            res.irqs.irqs[0], pl050_interrupt, (void *)pl050, &pl050_irq_code,
+            &ihandle);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed registering interrupt handler. (%s)",