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

Timestamp:

2019-02-23T17:16:01Z (6 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/con_srv.c (modified) (8 diffs)

uspace/lib/c/generic/io/con_srv.c

@@ -44 +44 @@
 static errno_t console_ev_encode(cons_event_t *event, ipc_call_t *icall)
 {
-        IPC_SET_ARG1(*icall, event->type);
+        ipc_set_arg1(icall, event->type);
 
         switch (event->type) {
         case CEV_KEY:
-                IPC_SET_ARG2(*icall, event->ev.key.type);
-                IPC_SET_ARG3(*icall, event->ev.key.key);
-                IPC_SET_ARG4(*icall, event->ev.key.mods);
-                IPC_SET_ARG5(*icall, event->ev.key.c);
+                ipc_set_arg2(icall, event->ev.key.type);
+                ipc_set_arg3(icall, event->ev.key.key);
+                ipc_set_arg4(icall, event->ev.key.mods);
+                ipc_set_arg5(icall, event->ev.key.c);
                 break;
         case CEV_POS:
-                IPC_SET_ARG2(*icall, (event->ev.pos.pos_id << 16) | (event->ev.pos.type & 0xffff));
-                IPC_SET_ARG3(*icall, event->ev.pos.btn_num);
-                IPC_SET_ARG4(*icall, event->ev.pos.hpos);
-                IPC_SET_ARG5(*icall, event->ev.pos.vpos);
+                ipc_set_arg2(icall, (event->ev.pos.pos_id << 16) | (event->ev.pos.type & 0xffff));
+                ipc_set_arg3(icall, event->ev.pos.btn_num);
+                ipc_set_arg4(icall, event->ev.pos.hpos);
+                ipc_set_arg5(icall, event->ev.pos.vpos);
                 break;
         default:
@@ -158 +158 @@
         sysarg_t row;
 
-        col = IPC_GET_ARG1(*icall);
-        row = IPC_GET_ARG2(*icall);
+        col = ipc_get_arg1(icall);
+        row = ipc_get_arg2(icall);
 
         if (srv->srvs->ops->set_pos == NULL) {
@@ -218 +218 @@
         console_style_t style;
 
-        style = IPC_GET_ARG1(*icall);
+        style = ipc_get_arg1(icall);
 
         if (srv->srvs->ops->set_style == NULL) {
@@ -235 +235 @@
         console_color_attr_t flags;
 
-        bgcolor = IPC_GET_ARG1(*icall);
-        fgcolor = IPC_GET_ARG2(*icall);
-        flags = IPC_GET_ARG3(*icall);
+        bgcolor = ipc_get_arg1(icall);
+        fgcolor = ipc_get_arg2(icall);
+        flags = ipc_get_arg3(icall);
 
         if (srv->srvs->ops->set_color == NULL) {
@@ -253 +253 @@
         pixel_t fgcolor;
 
-        bgcolor = IPC_GET_ARG1(*icall);
-        fgcolor = IPC_GET_ARG2(*icall);
+        bgcolor = ipc_get_arg1(icall);
+        fgcolor = ipc_get_arg2(icall);
 
         if (srv->srvs->ops->set_rgb_color == NULL) {
@@ -269 +269 @@
         bool show;
 
-        show = IPC_GET_ARG1(*icall);
+        show = ipc_get_arg1(icall);
 
         if (srv->srvs->ops->set_cursor_visibility == NULL) {
@@ -303 +303 @@
         }
 
-        async_answer_5(icall, rc, IPC_GET_ARG1(result), IPC_GET_ARG2(result),
-            IPC_GET_ARG3(result), IPC_GET_ARG4(result), IPC_GET_ARG5(result));
+        async_answer_5(icall, rc, ipc_get_arg1(&result), ipc_get_arg2(&result),
+            ipc_get_arg3(&result), ipc_get_arg4(&result), ipc_get_arg5(&result));
 }
 
@@ -364 +364 @@
                         break;
 
-                sysarg_t method = IPC_GET_IMETHOD(call);
+                sysarg_t method = ipc_get_imethod(&call);
 
                 if (!method) {