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

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

@@ -47 +47 @@
 {
         if (answer->buffer) {
-                uintptr_t dst = IPC_GET_ARG1(answer->data);
-                size_t size = IPC_GET_ARG2(answer->data);
+                uintptr_t dst = ipc_get_arg1(&answer->data);
+                size_t size = ipc_get_arg2(&answer->data);
                 errno_t rc;
 
                 rc = copy_to_uspace((void *) dst, answer->buffer, size);
                 if (rc)
-                        IPC_SET_RETVAL(answer->data, rc);
+                        ipc_set_retval(&answer->data, rc);
         }