Changeset 92574f4 in mainline for uspace/app/trace/trace.c

Timestamp:

2011-02-24T12:03:27Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e7b7ebd5

Parents:

4837092 (diff), a80849c (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:

Merged development (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:

• uspace/app/trace/trace.c (modified) (3 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) {
@@ -745 +744 @@
         abort_trace = true;
         udebug_end(phoneid);
-        ipc_hangup(phoneid);
+        async_hangup(phoneid);
 
         ipcp_cleanup();