Changeset ab87db5 in mainline for kernel/generic/src/ipc/ops/concttome.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:

• kernel/generic/src/ipc/ops/concttome.c (modified) (4 diffs)

kernel/generic/src/ipc/ops/concttome.c

@@ -49 +49 @@
                  * Set the sender-assigned label to the new phone.
                  */
-                pobj->phone->label = IPC_GET_ARG5(call->data);
+                pobj->phone->label = ipc_get_arg5(&call->data);
         }
         call->priv = (sysarg_t) pobj;
-        IPC_SET_ARG5(call->data, CAP_HANDLE_RAW(phandle));
+        ipc_set_arg5(&call->data, cap_handle_raw(phandle));
         return 0;
 }
@@ -58 +58 @@
 static errno_t answer_cleanup(call_t *answer, ipc_data_t *olddata)
 {
-        cap_phone_handle_t phandle = (cap_handle_t) IPC_GET_ARG5(*olddata);
+        cap_phone_handle_t phandle = (cap_handle_t) ipc_get_arg5(olddata);
         kobject_t *pobj = (kobject_t *) answer->priv;
 
-        if (CAP_HANDLE_VALID(phandle)) {
+        if (cap_handle_valid(phandle)) {
                 kobject_put(pobj);
                 cap_free(TASK, phandle);
@@ -71 +71 @@
 static errno_t answer_preprocess(call_t *answer, ipc_data_t *olddata)
 {
-        cap_phone_handle_t phandle = (cap_handle_t) IPC_GET_ARG5(*olddata);
+        cap_phone_handle_t phandle = (cap_handle_t) ipc_get_arg5(olddata);
         kobject_t *pobj = (kobject_t *) answer->priv;
 
-        if (IPC_GET_RETVAL(answer->data) != EOK) {
+        if (ipc_get_retval(&answer->data) != EOK) {
                 /* The connection was not accepted */
                 answer_cleanup(answer, olddata);
-        } else if (CAP_HANDLE_VALID(phandle)) {
+        } else if (cap_handle_valid(phandle)) {
                 /*
                  * The connection was accepted
@@ -94 +94 @@
                 } else {
                         /* The answerbox is shutting down. */
-                        IPC_SET_RETVAL(answer->data, ENOENT);
+                        ipc_set_retval(&answer->data, ENOENT);
                         answer_cleanup(answer, olddata);
                 }
         } else {
-                IPC_SET_RETVAL(answer->data, ELIMIT);
+                ipc_set_retval(&answer->data, ELIMIT);
         }