Changes in uspace/drv/hid/usbhid/kbd/kbddev.c [338d54a7:eed4139] in mainline

File:

• uspace/drv/hid/usbhid/kbd/kbddev.c (modified) (6 diffs)

uspace/drv/hid/usbhid/kbd/kbddev.c

@@ -72 +72 @@
 #include "../usbhid.h"
 
-static void default_connection_handler(ddf_fun_t *, ipc_callid_t, ipc_call_t *);
+static void default_connection_handler(ddf_fun_t *, cap_call_handle_t, ipc_call_t *);
 static ddf_dev_ops_t kbdops = { .default_handler = default_connection_handler };
 
@@ -156 +156 @@
  * KBDEV_SET_IND sets LED keyboard indicators.
  *
- * @param fun Device function handling the call.
- * @param icallid Call id.
- * @param icall Call data.
- */
-static void default_connection_handler(ddf_fun_t *fun,
-    ipc_callid_t icallid, ipc_call_t *icall)
+ * @param fun           Device function handling the call.
+ * @param icall_handle  Call handle.
+ * @param icall         Call data.
+ */
+static void
+default_connection_handler(ddf_fun_t *fun, cap_call_handle_t icall_handle,
+    ipc_call_t *icall)
 {
         const sysarg_t method = IPC_GET_IMETHOD(*icall);
@@ -171 +172 @@
                 kbd_dev->mods = IPC_GET_ARG1(*icall);
                 usb_kbd_set_led(kbd_dev->hid_dev, kbd_dev);
-                async_answer_0(icallid, EOK);
+                async_answer_0(icall_handle, EOK);
                 break;
         /* This might be ugly but async_callback_receive_start makes no
@@ -181 +182 @@
                         usb_log_warning(
                             "Failed to create start console session.\n");
-                        async_answer_0(icallid, EAGAIN);
+                        async_answer_0(icall_handle, EAGAIN);
                         break;
                 }
@@ -187 +188 @@
                         kbd_dev->client_sess = sess;
                         usb_log_debug("%s: OK", __FUNCTION__);
-                        async_answer_0(icallid, EOK);
+                        async_answer_0(icall_handle, EOK);
                 } else {
                         usb_log_error("%s: console session already set",
                            __FUNCTION__);
-                        async_answer_0(icallid, ELIMIT);
+                        async_answer_0(icall_handle, ELIMIT);
                 }
                 break;
@@ -197 +198 @@
                         usb_log_error("%s: Unknown method: %d.",
                             __FUNCTION__, (int) method);
-                        async_answer_0(icallid, EINVAL);
+                        async_answer_0(icall_handle, EINVAL);
                         break;
         }