Changeset a46e56b in mainline for uspace/drv/hid/usbhid

Timestamp:

2018-03-22T06:49:35Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

77f0a1d

Parents:

3e242d2

git-author:

Jakub Jermar <jakub@…> (2018-03-21 23:29:06)

git-committer:

Jakub Jermar <jakub@…> (2018-03-22 06:49:35)

Message:

Prefer handle over ID in naming handle variables

Location:

uspace/drv/hid/usbhid

Files:

• kbd/kbddev.c (modified) (5 diffs)
• mouse/mousedev.c (modified) (3 diffs)
• multimedia/multimedia.c (modified) (2 diffs)

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

@@ -157 +157 @@
  *
  * @param fun Device function handling the call.
- * @param icallid Call id.
+ * @param icall_handle Call id.
  * @param icall Call data.
  */
 static void default_connection_handler(ddf_fun_t *fun,
-    cap_call_handle_t icallid, ipc_call_t *icall)
+    cap_call_handle_t icall_handle, ipc_call_t *icall)
 {
         const sysarg_t method = IPC_GET_IMETHOD(*icall);
@@ -171 +171 @@
                 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 +181 @@
                         usb_log_warning(
                             "Failed to create start console session.\n");
-                        async_answer_0(icallid, EAGAIN);
+                        async_answer_0(icall_handle, EAGAIN);
                         break;
                 }
@@ -187 +187 @@
                         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 +197 @@
                         usb_log_error("%s: Unknown method: %d.",
                             __FUNCTION__, (int) method);
-                        async_answer_0(icallid, EINVAL);
+                        async_answer_0(icall_handle, EINVAL);
                         break;
         }

uspace/drv/hid/usbhid/mouse/mousedev.c

@@ -110 +110 @@
  *
  * @param fun Device function handling the call.
- * @param icallid Call id.
+ * @param icall_handle Call id.
  * @param icall Call data.
  */
 static void default_connection_handler(ddf_fun_t *fun,
-    cap_call_handle_t icallid, ipc_call_t *icall)
+    cap_call_handle_t icall_handle, ipc_call_t *icall)
 {
         usb_mouse_t *mouse_dev = ddf_fun_data_get(fun);
@@ -120 +120 @@
         if (mouse_dev == NULL) {
                 usb_log_debug("%s: Missing parameters.", __FUNCTION__);
-                async_answer_0(icallid, EINVAL);
+                async_answer_0(icall_handle, EINVAL);
                 return;
         }
@@ -135 +135 @@
                         usb_log_debug("Console session to %s set ok (%p).",
                             ddf_fun_get_name(fun), sess);
-                        async_answer_0(icallid, EOK);
+                        async_answer_0(icall_handle, EOK);
                 } else {
                         usb_log_error("Console session to %s already set.",
                             ddf_fun_get_name(fun));
-                        async_answer_0(icallid, ELIMIT);
+                        async_answer_0(icall_handle, ELIMIT);
                         async_hangup(sess);
                 }
         } else {
                 usb_log_debug("%s: Invalid function.", __FUNCTION__);
-                async_answer_0(icallid, EINVAL);
+                async_answer_0(icall_handle, EINVAL);
         }
 }

uspace/drv/hid/usbhid/multimedia/multimedia.c

@@ -81 +81 @@
  *
  * @param fun Device function handling the call.
- * @param icallid Call id.
+ * @param icall_handle Call id.
  * @param icall Call data.
  */
 static void default_connection_handler(ddf_fun_t *fun,
-    cap_call_handle_t icallid, ipc_call_t *icall)
+    cap_call_handle_t icall_handle, ipc_call_t *icall)
 {
         usb_log_debug(NAME " default_connection_handler()");
@@ -98 +98 @@
                         usb_log_debug(NAME " Saved session to console: %p",
                             sess);
-                        async_answer_0(icallid, EOK);
+                        async_answer_0(icall_handle, EOK);
                 } else
-                        async_answer_0(icallid, ELIMIT);
+                        async_answer_0(icall_handle, ELIMIT);
         } else
-                async_answer_0(icallid, EINVAL);
+                async_answer_0(icall_handle, EINVAL);
 }