Changeset ab87db5 in mainline for uspace/lib/graph/graph.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/graph/graph.c (modified) (8 diffs)

uspace/lib/graph/graph.c

@@ -243 +243 @@
 static void vs_claim(visualizer_t *vs, ipc_call_t *icall)
 {
-        vs->client_side_handle = IPC_GET_ARG1(*icall);
+        vs->client_side_handle = ipc_get_arg1(icall);
         errno_t rc = vs->ops.claim(vs);
         async_answer_0(icall, rc);
@@ -283 +283 @@
 
         fibril_mutex_lock(&vs->mode_mtx);
-        link_t *link = list_nth(&vs->modes, IPC_GET_ARG1(*icall));
+        link_t *link = list_nth(&vs->modes, ipc_get_arg1(icall));
 
         if (link != NULL) {
@@ -360 +360 @@
         }
 
-        sysarg_t mode_idx = IPC_GET_ARG1(*icall);
+        sysarg_t mode_idx = ipc_get_arg1(icall);
 
         fibril_mutex_lock(&vs->mode_mtx);
@@ -397 +397 @@
 
         /* Retrieve mode index and version. */
-        sysarg_t mode_idx = IPC_GET_ARG1(*icall);
-        sysarg_t mode_version = IPC_GET_ARG2(*icall);
+        sysarg_t mode_idx = ipc_get_arg1(icall);
+        sysarg_t mode_version = ipc_get_arg2(icall);
 
         /* Find mode in the list. */
@@ -470 +470 @@
 static void vs_update_damaged_region(visualizer_t *vs, ipc_call_t *icall)
 {
-        sysarg_t x_offset = (IPC_GET_ARG5(*icall) >> 16);
-        sysarg_t y_offset = (IPC_GET_ARG5(*icall) & 0x0000ffff);
+        sysarg_t x_offset = (ipc_get_arg5(icall) >> 16);
+        sysarg_t y_offset = (ipc_get_arg5(icall) & 0x0000ffff);
 
         errno_t rc = vs->ops.handle_damage(vs,
-            IPC_GET_ARG1(*icall), IPC_GET_ARG2(*icall),
-            IPC_GET_ARG3(*icall), IPC_GET_ARG4(*icall),
+            ipc_get_arg1(icall), ipc_get_arg2(icall),
+            ipc_get_arg3(icall), ipc_get_arg4(icall),
             x_offset, y_offset);
         async_answer_0(icall, rc);
@@ -516 +516 @@
                 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 VISUALIZER_CLAIM:
                         vs_claim(vs, &call);
@@ -576 +576 @@
                 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)) {
                 default:
                         async_answer_0(&call, EINVAL);
@@ -595 +595 @@
 {
         /* Find the visualizer or renderer with the given service ID. */
-        visualizer_t *vs = graph_get_visualizer(IPC_GET_ARG2(*icall));
-        renderer_t *rnd = graph_get_renderer(IPC_GET_ARG2(*icall));
+        visualizer_t *vs = graph_get_visualizer(ipc_get_arg2(icall));
+        renderer_t *rnd = graph_get_renderer(ipc_get_arg2(icall));
 
         if (vs != NULL)