Changes in uspace/drv/char/i8042/i8042.c [797ab95:fafb8e5] in mainline

File:

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

uspace/drv/char/i8042/i8042.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2001-2004 Jakub Jermar
  * Copyright (c) 2006 Josef Cejka
+ * Copyright (c) 2017 Jiri Svoboda
  * Copyright (c) 2011 Jan Vesely
  * All rights reserved.
@@ -123 +123 @@
  * Write new data to the corresponding buffer.
  *
- * @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;
+ * @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);
         errno_t rc;
 
@@ -145 +146 @@
         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);
 }
 
@@ -177 +175 @@
         bool aux_bound = false;
 
-        dev->dev = ddf_dev;
-
         if (regs->size < sizeof(i8042_regs_t)) {
                 rc = EINVAL;
@@ -206 +202 @@
         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);
@@ -231 +226 @@
         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);
@@ -289 +283 @@
         cap_irq_handle_t kbd_ihandle;
         rc = register_interrupt_handler(ddf_dev, irq_kbd,
-            i8042_irq_handler, (void *)dev, &irq_code, &kbd_ihandle);
+            i8042_irq_handler, &irq_code, &kbd_ihandle);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed set handler for kbd: %s.",
@@ -298 +292 @@
         cap_irq_handle_t mouse_ihandle;
         rc = register_interrupt_handler(ddf_dev, irq_mouse,
-            i8042_irq_handler, (void *)dev, &irq_code, &mouse_ihandle);
+            i8042_irq_handler, &irq_code, &mouse_ihandle);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed set handler for mouse: %s.",
@@ -346 +340 @@
 }
 
-/** Quiesce i8042.
- *
- * @param dev i8042 instance.
- */
-void i8042_quiesce(i8042_t *dev)
-{
-        /* Disable port interrupts. */
-        wait_ready(dev);
-        pio_write_8(&dev->regs->status, i8042_CMD_WRITE_CMDB);
-        wait_ready(dev);
-        pio_write_8(&dev->regs->data, i8042_KBD_TRANSLATE);
-}
-
 /** Write data to i8042 port.
  *