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

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

@@ -43 +43 @@
 static errno_t answer_preprocess(call_t *answer, ipc_data_t *olddata)
 {
-        if (!IPC_GET_RETVAL(answer->data)) {
+        if (!ipc_get_retval(&answer->data)) {
                 irq_spinlock_lock(&answer->sender->lock, true);
                 as_t *as = answer->sender->as;
@@ -49 +49 @@
 
                 uintptr_t dst_base = (uintptr_t) -1;
-                errno_t rc = as_area_share(AS, IPC_GET_ARG1(answer->data),
-                    IPC_GET_ARG1(*olddata), as, IPC_GET_ARG2(answer->data),
-                    &dst_base, IPC_GET_ARG2(*olddata));
-                IPC_SET_ARG5(answer->data, dst_base);
-                IPC_SET_RETVAL(answer->data, rc);
+                errno_t rc = as_area_share(AS, ipc_get_arg1(&answer->data),
+                    ipc_get_arg1(olddata), as, ipc_get_arg2(&answer->data),
+                    &dst_base, ipc_get_arg2(olddata));
+                ipc_set_arg5(&answer->data, dst_base);
+                ipc_set_retval(&answer->data, rc);
         }