Changes in uspace/drv/char/i8042/i8042.c [fafb8e5:60744cb] in mainline

File:

• uspace/drv/char/i8042/i8042.c (modified) (8 diffs)

uspace/drv/char/i8042/i8042.c

@@ -2 +2 @@
  * Copyright (c) 2001-2004 Jakub Jermar
  * Copyright (c) 2006 Josef Cejka
- * Copyright (c) 2017 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * Copyright (c) 2011 Jan Vesely
  * All rights reserved.
@@ -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;
 
@@ -146 +145 @@
         fibril_mutex_unlock(&port->buf_lock);
         fibril_condvar_broadcast(&port->buf_cv);
+
+        async_sess_t *parent_sess = ddf_dev_parent_sess_get(controller->dev);
+        hw_res_clear_interrupt(parent_sess, port->irq);
 }
 
@@ -175 +177 @@
         bool aux_bound = false;
 
+        dev->dev = ddf_dev;
+
         if (regs->size < sizeof(i8042_regs_t)) {
                 rc = EINVAL;
@@ -202 +206 @@
         dev->kbd->cds.ops = &i8042_chardev_ops;
         dev->kbd->cds.sarg = dev->kbd;
+        dev->kbd->irq = irq_kbd;
         fibril_mutex_initialize(&dev->kbd->buf_lock);
         fibril_condvar_initialize(&dev->kbd->buf_cv);
@@ -226 +231 @@
         dev->aux->cds.ops = &i8042_chardev_ops;
         dev->aux->cds.sarg = dev->aux;
+        dev->aux->irq = irq_mouse;
         fibril_mutex_initialize(&dev->aux->buf_lock);
         fibril_condvar_initialize(&dev->aux->buf_cv);
@@ -283 +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.",
@@ -292 +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.",