Changeset bc73be3 in mainline for kernel/generic/src/ipc/ops/shareout.c

Timestamp:

2019-06-27T08:51:20Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (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.

Message:

cpp: merge and resolve conflicts

File:

• kernel/generic/src/ipc/ops/shareout.c (modified) (3 diffs)

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

@@ -44 +44 @@
 static errno_t request_preprocess(call_t *call, phone_t *phone)
 {
-        size_t size = as_area_get_size(IPC_GET_ARG1(call->data));
+        size_t size = as_area_get_size(ipc_get_arg1(&call->data));
 
         if (!size)
                 return EPERM;
-        IPC_SET_ARG2(call->data, size);
+        ipc_set_arg2(&call->data, size);
 
         return EOK;
@@ -57 +57 @@
         errno_t rc = EOK;
 
-        if (!IPC_GET_RETVAL(answer->data)) {
+        if (!ipc_get_retval(&answer->data)) {
                 /* Accepted, handle as_area receipt */
 
@@ -65 +65 @@
 
                 uintptr_t dst_base = (uintptr_t) -1;
-                rc = as_area_share(as, IPC_GET_ARG1(*olddata),
-                    IPC_GET_ARG2(*olddata), AS, IPC_GET_ARG3(*olddata),
-                    &dst_base, IPC_GET_ARG1(answer->data));
+                rc = as_area_share(as, ipc_get_arg1(olddata),
+                    ipc_get_arg2(olddata), AS, ipc_get_arg3(olddata),
+                    &dst_base, ipc_get_arg1(&answer->data));
 
                 if (rc == EOK) {
-                        rc = copy_to_uspace((void *) IPC_GET_ARG2(answer->data),
+                        rc = copy_to_uspace((void *) ipc_get_arg2(&answer->data),
                             &dst_base, sizeof(dst_base));
                 }
 
-                IPC_SET_RETVAL(answer->data, rc);
+                ipc_set_retval(&answer->data, rc);
         }