Changeset a46e56b in mainline for uspace/lib/c/generic/io/input.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/lib/c/generic/io/input.c (modified) (8 diffs)

uspace/lib/c/generic/io/input.c

@@ -43 +43 @@
 #include <stdlib.h>
 
-static void input_cb_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg);
+static void input_cb_conn(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg);
 
 errno_t input_open(async_sess_t *sess, input_ev_ops_t *ev_ops,
@@ -92 +92 @@
 }
 
-static void input_ev_active(input_t *input, cap_call_handle_t callid,
+static void input_ev_active(input_t *input, cap_call_handle_t chandle,
     ipc_call_t *call)
 {
         errno_t rc = input->ev_ops->active(input);
-        async_answer_0(callid, rc);
-}
-
-static void input_ev_deactive(input_t *input, cap_call_handle_t callid,
+        async_answer_0(chandle, rc);
+}
+
+static void input_ev_deactive(input_t *input, cap_call_handle_t chandle,
     ipc_call_t *call)
 {
         errno_t rc = input->ev_ops->deactive(input);
-        async_answer_0(callid, rc);
-}
-
-static void input_ev_key(input_t *input, cap_call_handle_t callid,
+        async_answer_0(chandle, rc);
+}
+
+static void input_ev_key(input_t *input, cap_call_handle_t chandle,
     ipc_call_t *call)
 {
@@ -121 +121 @@
 
         rc = input->ev_ops->key(input, type, key, mods, c);
-        async_answer_0(callid, rc);
-}
-
-static void input_ev_move(input_t *input, cap_call_handle_t callid,
+        async_answer_0(chandle, rc);
+}
+
+static void input_ev_move(input_t *input, cap_call_handle_t chandle,
     ipc_call_t *call)
 {
@@ -135 +135 @@
 
         rc = input->ev_ops->move(input, dx, dy);
-        async_answer_0(callid, rc);
-}
-
-static void input_ev_abs_move(input_t *input, cap_call_handle_t callid,
+        async_answer_0(chandle, rc);
+}
+
+static void input_ev_abs_move(input_t *input, cap_call_handle_t chandle,
     ipc_call_t *call)
 {
@@ -153 +153 @@
 
         rc = input->ev_ops->abs_move(input, x, y, max_x, max_y);
-        async_answer_0(callid, rc);
-}
-
-static void input_ev_button(input_t *input, cap_call_handle_t callid,
+        async_answer_0(chandle, rc);
+}
+
+static void input_ev_button(input_t *input, cap_call_handle_t chandle,
     ipc_call_t *call)
 {
@@ -167 +167 @@
 
         rc = input->ev_ops->button(input, bnum, press);
-        async_answer_0(callid, rc);
-}
-
-static void input_cb_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
+        async_answer_0(chandle, rc);
+}
+
+static void input_cb_conn(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
 {
         input_t *input = (input_t *)arg;
@@ -176 +176 @@
         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)) {
@@ -185 +185 @@
                 switch (IPC_GET_IMETHOD(call)) {
                 case INPUT_EVENT_ACTIVE:
-                        input_ev_active(input, callid, &call);
+                        input_ev_active(input, chandle, &call);
                         break;
                 case INPUT_EVENT_DEACTIVE:
-                        input_ev_deactive(input, callid, &call);
+                        input_ev_deactive(input, chandle, &call);
                         break;
                 case INPUT_EVENT_KEY:
-                        input_ev_key(input, callid, &call);
+                        input_ev_key(input, chandle, &call);
                         break;
                 case INPUT_EVENT_MOVE:
-                        input_ev_move(input, callid, &call);
+                        input_ev_move(input, chandle, &call);
                         break;
                 case INPUT_EVENT_ABS_MOVE:
-                        input_ev_abs_move(input, callid, &call);
+                        input_ev_abs_move(input, chandle, &call);
                         break;
                 case INPUT_EVENT_BUTTON:
-                        input_ev_button(input, callid, &call);
+                        input_ev_button(input, chandle, &call);
                         break;
                 default:
-                        async_answer_0(callid, ENOTSUP);
+                        async_answer_0(chandle, ENOTSUP);
                 }
         }