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

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

@@ -46 +46 @@
 
         kobject_t *sender_obj = kobject_get(TASK,
-            (cap_handle_t) IPC_GET_ARG5(call->data), KOBJECT_TYPE_PHONE);
+            (cap_handle_t) ipc_get_arg5(&call->data), KOBJECT_TYPE_PHONE);
         if (!sender_obj)
                 return ENOENT;
@@ -62 +62 @@
 
         /* Remember the third party task hash. */
-        IPC_SET_ARG5(call->data, (sysarg_t) other_task_s);
+        ipc_set_arg5(&call->data, (sysarg_t) other_task_s);
 
         kobject_put(sender_obj);
@@ -72 +72 @@
         errno_t rc = EOK;
 
-        if (!IPC_GET_RETVAL(answer->data)) {
+        if (!ipc_get_retval(&answer->data)) {
                 /* The recipient authorized the change of state. */
                 task_t *other_task_s;
@@ -78 +78 @@
 
                 kobject_t *recipient_obj = kobject_get(TASK,
-                    (cap_handle_t) IPC_GET_ARG1(answer->data),
+                    (cap_handle_t) ipc_get_arg1(&answer->data),
                     KOBJECT_TYPE_PHONE);
                 if (!recipient_obj) {
-                        IPC_SET_RETVAL(answer->data, ENOENT);
+                        ipc_set_retval(&answer->data, ENOENT);
                         return ENOENT;
                 }
@@ -88 +88 @@
                 if (recipient_obj->phone->state != IPC_PHONE_CONNECTED) {
                         mutex_unlock(&recipient_obj->phone->lock);
-                        IPC_SET_RETVAL(answer->data, EINVAL);
+                        ipc_set_retval(&answer->data, EINVAL);
                         kobject_put(recipient_obj);
                         return EINVAL;
@@ -94 +94 @@
 
                 other_task_r = recipient_obj->phone->callee->task;
-                other_task_s = (task_t *) IPC_GET_ARG5(*olddata);
+                other_task_s = (task_t *) ipc_get_arg5(olddata);
 
                 /*
@@ -101 +101 @@
                  */
                 if (other_task_r != other_task_s) {
-                        IPC_SET_RETVAL(answer->data, EINVAL);
+                        ipc_set_retval(&answer->data, EINVAL);
                         rc = EINVAL;
                 } else {
                         rc = event_task_notify_5(other_task_r,
                             EVENT_TASK_STATE_CHANGE, false,
-                            IPC_GET_ARG1(*olddata),
-                            IPC_GET_ARG2(*olddata),
-                            IPC_GET_ARG3(*olddata),
+                            ipc_get_arg1(olddata),
+                            ipc_get_arg2(olddata),
+                            ipc_get_arg3(olddata),
                             LOWER32(olddata->task_id),
                             UPPER32(olddata->task_id));
-                        IPC_SET_RETVAL(answer->data, rc);
+                        ipc_set_retval(&answer->data, rc);
                 }