Changeset b0f00a9 in mainline for uspace/app/trace/syscalls.c

Timestamp:

2011-11-06T22:21:05Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

898e847

Parents:

2bdf8313 (diff), 7b5f4c9 (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/syscalls.c (modified) (3 diffs)

uspace/app/trace/syscalls.c

@@ -33 +33 @@
  */
 
-#include <kernel/syscall/syscall.h>
+#include <abi/syscall.h>
 #include "syscalls.h"
 #include "trace.h"
@@ -40 +40 @@
     [SYS_KLOG] ={ "klog",                               3,      V_INT_ERRNO },
     [SYS_TLS_SET] = { "tls_set",                        1,      V_ERRNO },
+
     [SYS_THREAD_CREATE] = { "thread_create",            3,      V_ERRNO },
     [SYS_THREAD_EXIT] = { "thread_exit",                1,      V_ERRNO },
@@ -74 +75 @@
     [SYS_UNREGISTER_IRQ] = { "unregister_irq",  2,      V_ERRNO },
 
-    [SYS_SYSINFO_GET_TAG] = { "sysinfo_get_tag",                2,      V_INTEGER },
+    [SYS_SYSINFO_GET_VAL_TYPE] = { "sysinfo_get_val_type",              2,      V_INTEGER },
     [SYS_SYSINFO_GET_VALUE] = { "sysinfo_get_value",            3,      V_ERRNO },
     [SYS_SYSINFO_GET_DATA_SIZE] = { "sysinfo_get_data_size",    3,      V_ERRNO },
     [SYS_SYSINFO_GET_DATA] = { "sysinfo_get_data",              5,      V_ERRNO },
 
-    [SYS_DEBUG_ENABLE_CONSOLE] = { "debug_enable_console", 0,   V_ERRNO },
+    [SYS_DEBUG_ACTIVATE_CONSOLE] = { "debug_activate_console", 0,       V_ERRNO },
     [SYS_IPC_CONNECT_KBOX] = { "ipc_connect_kbox",      1,      V_ERRNO }
 };