Changeset a46e56b in mainline for uspace/drv/hid/adb-kbd/adb-kbd.c

Timestamp:

2018-03-22T06:49:35Z (7 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

File:

• uspace/drv/hid/adb-kbd/adb-kbd.c (modified) (6 diffs)

uspace/drv/hid/adb-kbd/adb-kbd.c

@@ -130 +130 @@
 }
 
-static void adb_kbd_events(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
+static void adb_kbd_events(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
 {
         adb_kbd_t *kbd = (adb_kbd_t *) arg;
@@ -138 +138 @@
 
                 ipc_call_t call;
-                cap_call_handle_t callid = async_get_call(&call);
+                cap_call_handle_t chandle = async_get_call(&call);
 
                 errno_t retval = EOK;
@@ -154 +154 @@
                         retval = ENOENT;
                 }
-                async_answer_0(callid, retval);
+                async_answer_0(chandle, retval);
         }
 }
@@ -190 +190 @@
 
 /** Handle client connection */
-static void adb_kbd_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
-{
-        cap_call_handle_t callid;
+static void adb_kbd_conn(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
+{
+        cap_call_handle_t chandle;
         ipc_call_t call;
         sysarg_t method;
@@ -200 +200 @@
          * Answer the first IPC_M_CONNECT_ME_TO call.
          */
-        async_answer_0(iid, EOK);
+        async_answer_0(icall_handle, EOK);
 
         kbd = (adb_kbd_t *)ddf_dev_data_get(ddf_fun_get_dev((ddf_fun_t *)arg));
 
         while (true) {
-                callid = async_get_call(&call);
+                chandle = async_get_call(&call);
                 method = IPC_GET_IMETHOD(call);
 
                 if (!method) {
                         /* The other side has hung up. */
-                        async_answer_0(callid, EOK);
+                        async_answer_0(chandle, EOK);
                         return;
                 }
@@ -218 +218 @@
                 if (sess != NULL) {
                         kbd->client_sess = sess;
-                        async_answer_0(callid, EOK);
+                        async_answer_0(chandle, EOK);
                 } else {
-                        async_answer_0(callid, EINVAL);
+                        async_answer_0(chandle, EINVAL);
                 }
         }