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

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 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;
 
@@ -146 +147 @@
         fibril_condvar_broadcast(&port->buf_cv);
 
-        async_sess_t *parent_sess = ddf_dev_parent_sess_get(controller->dev);
+        async_sess_t *parent_sess = ddf_dev_parent_sess_get(dev);
         hw_res_clear_interrupt(parent_sess, port->irq);
 }
@@ -177 +178 @@
         bool aux_bound = false;
 
-        dev->dev = ddf_dev;
-
         if (regs->size < sizeof(i8042_regs_t)) {
                 rc = EINVAL;
@@ -289 +288 @@
         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 +297 @@
         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.",