Changeset ab87db5 in mainline for uspace/srv/hid/output/output.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/srv/hid/output/output.c (modified) (9 diffs)

uspace/srv/hid/output/output.c

@@ -187 +187 @@
 static void srv_frontbuf_destroy(ipc_call_t *icall)
 {
-        frontbuf_t *frontbuf = resolve_frontbuf(IPC_GET_ARG1(*icall), icall);
+        frontbuf_t *frontbuf = resolve_frontbuf(ipc_get_arg1(icall), icall);
         if (frontbuf == NULL)
                 return;
@@ -200 +200 @@
 static void srv_cursor_update(ipc_call_t *icall)
 {
-        frontbuf_t *frontbuf = resolve_frontbuf(IPC_GET_ARG1(*icall), icall);
+        frontbuf_t *frontbuf = resolve_frontbuf(ipc_get_arg1(icall), icall);
         if (frontbuf == NULL)
                 return;
@@ -235 +235 @@
                 dev->attrs.type = CHAR_ATTR_STYLE;
                 dev->attrs.val.style =
-                    (console_style_t) IPC_GET_ARG1(*icall);
+                    (console_style_t) ipc_get_arg1(icall);
         }
 
@@ -246 +246 @@
                 dev->attrs.type = CHAR_ATTR_INDEX;
                 dev->attrs.val.index.bgcolor =
-                    (console_color_t) IPC_GET_ARG1(*icall);
+                    (console_color_t) ipc_get_arg1(icall);
                 dev->attrs.val.index.fgcolor =
-                    (console_color_t) IPC_GET_ARG2(*icall);
+                    (console_color_t) ipc_get_arg2(icall);
                 dev->attrs.val.index.attr =
-                    (console_color_attr_t) IPC_GET_ARG3(*icall);
+                    (console_color_attr_t) ipc_get_arg3(icall);
         }
 
@@ -260 +260 @@
         list_foreach(outdevs, link, outdev_t, dev) {
                 dev->attrs.type = CHAR_ATTR_RGB;
-                dev->attrs.val.rgb.bgcolor = IPC_GET_ARG1(*icall);
-                dev->attrs.val.rgb.fgcolor = IPC_GET_ARG2(*icall);
+                dev->attrs.val.rgb.bgcolor = ipc_get_arg1(icall);
+                dev->attrs.val.rgb.fgcolor = ipc_get_arg2(icall);
         }
 
@@ -308 +308 @@
 static void srv_update(ipc_call_t *icall)
 {
-        frontbuf_t *frontbuf = resolve_frontbuf(IPC_GET_ARG1(*icall), icall);
+        frontbuf_t *frontbuf = resolve_frontbuf(ipc_get_arg1(icall), icall);
         if (frontbuf == NULL)
                 return;
@@ -357 +357 @@
 static void srv_damage(ipc_call_t *icall)
 {
-        frontbuf_t *frontbuf = resolve_frontbuf(IPC_GET_ARG1(*icall), icall);
+        frontbuf_t *frontbuf = resolve_frontbuf(ipc_get_arg1(icall), icall);
         if (frontbuf == NULL)
                 return;
@@ -369 +369 @@
                         continue;
 
-                sysarg_t col = IPC_GET_ARG2(*icall);
-                sysarg_t row = IPC_GET_ARG3(*icall);
-
-                sysarg_t cols = IPC_GET_ARG4(*icall);
-                sysarg_t rows = IPC_GET_ARG5(*icall);
+                sysarg_t col = ipc_get_arg2(icall);
+                sysarg_t row = ipc_get_arg3(icall);
+
+                sysarg_t cols = ipc_get_arg4(icall);
+                sysarg_t rows = ipc_get_arg5(icall);
 
                 for (sysarg_t y = 0; y < rows; y++) {
@@ -404 +404 @@
                 async_get_call(&call);
 
-                if (!IPC_GET_IMETHOD(call)) {
+                if (!ipc_get_imethod(&call)) {
                         async_answer_0(&call, EOK);
                         break;
                 }
 
-                switch (IPC_GET_IMETHOD(call)) {
+                switch (ipc_get_imethod(&call)) {
                 case OUTPUT_YIELD:
                         srv_yield(&call);