Changeset ebb1489 in mainline for uspace/drv/char/i8042/i8042.c

Timestamp:

2024-10-13T08:23:40Z (2 months ago)

Author:

GitHub <noreply@…>

Children:

0472cf17

Parents:

2a0c827c (diff), b3b79981 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2024-10-13 08:23:40)

git-committer:

GitHub <noreply@…> (2024-10-13 08:23:40)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

File:

• uspace/drv/char/i8042/i8042.c (modified) (5 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.",