Changeset ab87db5 in mainline for uspace/lib/c/generic/io/input.c

Timestamp:

2019-02-23T17:16:01Z (5 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

8c193d83, ca0e838

Parents:

bc417660 (diff), 95a47b0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-23 17:16:01)

git-committer:

GitHub <noreply@…> (2019-02-23 17:16:01)

Message:

Merge pull request #157

Turn some function-like macros into functions

File:

• uspace/lib/c/generic/io/input.c (modified) (5 diffs)

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

@@ -112 +112 @@
         errno_t rc;
 
-        type = IPC_GET_ARG1(*call);
-        key = IPC_GET_ARG2(*call);
-        mods = IPC_GET_ARG3(*call);
-        c = IPC_GET_ARG4(*call);
+        type = ipc_get_arg1(call);
+        key = ipc_get_arg2(call);
+        mods = ipc_get_arg3(call);
+        c = ipc_get_arg4(call);
 
         rc = input->ev_ops->key(input, type, key, mods, c);
@@ -127 +127 @@
         errno_t rc;
 
-        dx = IPC_GET_ARG1(*call);
-        dy = IPC_GET_ARG2(*call);
+        dx = ipc_get_arg1(call);
+        dy = ipc_get_arg2(call);
 
         rc = input->ev_ops->move(input, dx, dy);
@@ -142 +142 @@
         errno_t rc;
 
-        x = IPC_GET_ARG1(*call);
-        y = IPC_GET_ARG2(*call);
-        max_x = IPC_GET_ARG3(*call);
-        max_y = IPC_GET_ARG4(*call);
+        x = ipc_get_arg1(call);
+        y = ipc_get_arg2(call);
+        max_x = ipc_get_arg3(call);
+        max_y = ipc_get_arg4(call);
 
         rc = input->ev_ops->abs_move(input, x, y, max_x, max_y);
@@ -157 +157 @@
         errno_t rc;
 
-        bnum = IPC_GET_ARG1(*call);
-        press = IPC_GET_ARG2(*call);
+        bnum = ipc_get_arg1(call);
+        press = ipc_get_arg2(call);
 
         rc = input->ev_ops->button(input, bnum, press);
@@ -172 +172 @@
                 async_get_call(&call);
 
-                if (!IPC_GET_IMETHOD(call)) {
+                if (!ipc_get_imethod(&call)) {
                         async_answer_0(&call, EOK);
                         return;
                 }
 
-                switch (IPC_GET_IMETHOD(call)) {
+                switch (ipc_get_imethod(&call)) {
                 case INPUT_EVENT_ACTIVE:
                         input_ev_active(input, &call);