Changeset 3b2e387 in mainline for uspace/app/trace/trace.c

Timestamp:

2011-06-21T19:36:05Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

e3a6c45

Parents:

40f606b (diff), 022d9f67 (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 input server, console and various other improvements

File:

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

uspace/app/trace/trace.c

@@ -792 +792 @@
         proto_register(SERVICE_VFS, p);
 
+#if 0
         p = proto_new("console");
 
@@ -827 +828 @@
         proto_console = p;
         proto_register(SERVICE_CONSOLE, p);
+#endif
 }