Changeset cf2af94 in mainline for uspace/app/trace/trace.c

Timestamp:

2011-02-09T11:46:47Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cb15135a

Parents:

a49c4002 (diff), 0b37882 (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

Local modifications:

• change pipefs and ext2 to build again (use async_* calls instead of ipc_*)

File:

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

uspace/app/trace/trace.c ¶

@@ -36 +36 @@
 #include <stdlib.h>
 #include <unistd.h>
-#include <ipc/ipc.h>
 #include <fibril.h>
 #include <errno.h>
@@ -149 +148 @@
         int rc;
 
-        rc = ipc_connect_kbox(task_id);
+        rc = async_connect_kbox(task_id);
 
         if (rc == ENOTSUP) {
@@ -287 +286 @@
 {
         ipc_call_t call;
-        ipcarg_t phoneid;
+        sysarg_t phoneid;
         
         if (sc_rc == (sysarg_t) IPC_CALLRET_FATAL ||
@@ -295 +294 @@
         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 +330 @@
         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]);
@@ -745 +744 @@
         abort_trace = true;
         udebug_end(phoneid);
-        ipc_hangup(phoneid);
+        async_hangup(phoneid);
 
         ipcp_cleanup();