Changeset 87b4baa in mainline for uspace/app/trace/trace.c

Timestamp:

2010-12-17T20:16:46Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

424558a

Parents:

463e734 (diff), bbc74af7 (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:

Merge mainline changes

File:

• uspace/app/trace/trace.c (modified) (3 diffs)

uspace/app/trace/trace.c

@@ -287 +287 @@
 {
         ipc_call_t call;
-        ipcarg_t phoneid;
+        sysarg_t phoneid;
         
         if (sc_rc == (sysarg_t) IPC_CALLRET_FATAL ||
@@ -295 +295 @@
         phoneid = sc_args[0];
 
-        IPC_SET_METHOD(call, sc_args[1]);
+        IPC_SET_IMETHOD(call, sc_args[1]);
         IPC_SET_ARG1(call, sc_args[2]);
         IPC_SET_ARG2(call, sc_args[3]);
@@ -331 +331 @@
         phoneidx = sc_args[0];
 
-        IPC_SET_METHOD(question, sc_args[1]);
+        IPC_SET_IMETHOD(question, sc_args[1]);
         IPC_SET_ARG1(question, sc_args[2]);
         IPC_SET_ARG2(question, sc_args[3]);