Changeset ab87db5 in mainline for kernel/generic/src/ipc/ops/conctmeto.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/conctmeto.c (modified) (4 diffs)

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

@@ -59 +59 @@
 
         /* Remember the handle */
-        IPC_SET_ARG5(call->data, (sysarg_t) phandle);
+        ipc_set_arg5(&call->data, (sysarg_t) phandle);
 
         return EOK;
@@ -66 +66 @@
 static errno_t request_forget(call_t *call)
 {
-        cap_phone_handle_t phandle = (cap_handle_t) IPC_GET_ARG5(call->data);
+        cap_phone_handle_t phandle = (cap_handle_t) ipc_get_arg5(&call->data);
 
-        if (CAP_HANDLE_RAW(phandle) < 0)
+        if (cap_handle_raw(phandle) < 0)
                 return EOK;
 
@@ -88 +88 @@
 
         /* Set the recipient-assigned label */
-        pobj->phone->label = IPC_GET_ARG5(answer->data);
+        pobj->phone->label = ipc_get_arg5(&answer->data);
 
         /* Restore phone handle in answer's ARG5 */
-        IPC_SET_ARG5(answer->data, IPC_GET_ARG5(*olddata));
+        ipc_set_arg5(&answer->data, ipc_get_arg5(olddata));
 
         /* If the user accepted the call, connect */
-        if (IPC_GET_RETVAL(answer->data) == EOK) {
+        if (ipc_get_retval(&answer->data) == EOK) {
                 /* Hand over reference from pobj to the answerbox */
                 (void) ipc_phone_connect(pobj->phone, &TASK->answerbox);
@@ -107 +107 @@
 static errno_t answer_process(call_t *answer)
 {
-        cap_phone_handle_t phandle = (cap_handle_t) IPC_GET_ARG5(answer->data);
+        cap_phone_handle_t phandle = (cap_handle_t) ipc_get_arg5(&answer->data);
         /* Move the reference from answer->priv to pobj */
         kobject_t *pobj = (kobject_t *) answer->priv;
         answer->priv = 0;
 
-        if (IPC_GET_RETVAL(answer->data)) {
-                if (CAP_HANDLE_RAW(phandle) >= 0) {
+        if (ipc_get_retval(&answer->data)) {
+                if (cap_handle_raw(phandle) >= 0) {
                         /*
                          * Cleanup the unpublished capability and drop