Changeset bc73be3 in mainline for uspace/app/trace/trace.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:

• uspace/app/trace/trace.c (modified) (1 diff)

uspace/app/trace/trace.c

@@ -302 +302 @@
         phandle = (cap_phone_handle_t) sc_args[0];
 
-        IPC_SET_IMETHOD(call, sc_args[1]);
-        IPC_SET_ARG1(call, sc_args[2]);
-        IPC_SET_ARG2(call, sc_args[3]);
-        IPC_SET_ARG3(call, sc_args[4]);
-        IPC_SET_ARG4(call, sc_args[5]);
-        IPC_SET_ARG5(call, 0);
+        ipc_set_imethod(&call, sc_args[1]);
+        ipc_set_arg1(&call, sc_args[2]);
+        ipc_set_arg2(&call, sc_args[3]);
+        ipc_set_arg3(&call, sc_args[4]);
+        ipc_set_arg4(&call, sc_args[5]);
+        ipc_set_arg5(&call, 0);
 
         ipcp_call_out(phandle, &call, 0);