Changeset a46e56b in mainline for uspace/srv/hid/input

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/srv/hid/input

Files:

• ctl/kbdev.c (modified) (3 diffs)
• input.c (modified) (4 diffs)
• proto/mousedev.c (modified) (3 diffs)

uspace/srv/hid/input/ctl/kbdev.c

@@ -147 +147 @@
 }
 
-static void kbdev_callback_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
+static void kbdev_callback_conn(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
 {
         kbdev_t *kbdev;
@@ -158 +158 @@
         while (true) {
                 ipc_call_t call;
-                cap_call_handle_t callid;
+                cap_call_handle_t chandle;
 
-                callid = async_get_call(&call);
+                chandle = async_get_call(&call);
                 if (!IPC_GET_IMETHOD(call)) {
                         kbdev_destroy(kbdev);
@@ -179 +179 @@
                 }
 
-                async_answer_0(callid, retval);
+                async_answer_0(chandle, retval);
         }
 }

uspace/srv/hid/input/input.c

@@ -320 +320 @@
 
 /** New client connection */
-static void client_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
+static void client_connection(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
 {
         client_t *client = (client_t *) async_get_client_data();
         if (client == NULL) {
-                async_answer_0(iid, ENOMEM);
+                async_answer_0(icall_handle, ENOMEM);
                 return;
         }
 
-        async_answer_0(iid, EOK);
+        async_answer_0(icall_handle, EOK);
 
         while (true) {
                 ipc_call_t call;
-                cap_call_handle_t callid = async_get_call(&call);
+                cap_call_handle_t chandle = async_get_call(&call);
 
                 if (!IPC_GET_IMETHOD(call)) {
@@ -340 +340 @@
                         }
 
-                        async_answer_0(callid, EOK);
+                        async_answer_0(chandle, EOK);
                         return;
                 }
@@ -349 +349 @@
                         if (client->sess == NULL) {
                                 client->sess = sess;
-                                async_answer_0(callid, EOK);
+                                async_answer_0(chandle, EOK);
                         } else
-                                async_answer_0(callid, ELIMIT);
+                                async_answer_0(chandle, ELIMIT);
                 } else {
                         switch (IPC_GET_IMETHOD(call)) {
@@ -357 +357 @@
                                 active_client = client;
                                 client_arbitration();
-                                async_answer_0(callid, EOK);
+                                async_answer_0(chandle, EOK);
                                 break;
                         default:
-                                async_answer_0(callid, EINVAL);
+                                async_answer_0(chandle, EINVAL);
                         }
                 }

uspace/srv/hid/input/proto/mousedev.c

@@ -70 +70 @@
 }
 
-static void mousedev_callback_conn(cap_call_handle_t iid, ipc_call_t *icall,
+static void mousedev_callback_conn(cap_call_handle_t icall_handle, ipc_call_t *icall,
     void *arg)
 {
@@ -78 +78 @@
         while (true) {
                 ipc_call_t call;
-                cap_call_handle_t callid = async_get_call(&call);
+                cap_call_handle_t chandle = async_get_call(&call);
 
                 if (!IPC_GET_IMETHOD(call)) {
@@ -110 +110 @@
                 }
 
-                async_answer_0(callid, retval);
+                async_answer_0(chandle, retval);
         }
 }