Changeset 15d0046 in mainline for uspace/app/trace/syscalls.c

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (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

@@ -65 +65 @@
     [SYS_IPC_HANGUP] = { "ipc_hangup",                  1,      V_ERRNO },
 
-    [SYS_EVENT_SUBSCRIBE] = { "event_subscribe",        2,      V_ERRNO },
+    [SYS_IPC_EVENT_SUBSCRIBE] = { "ipc_event_subscribe",        2,      V_ERRNO },
+    [SYS_IPC_EVENT_UNSUBSCRIBE] = { "ipc_event_unsubscribe",    1,      V_ERRNO },
+    [SYS_IPC_EVENT_UNMASK] = { "ipc_event_unmask",      1,      V_ERRNO },
 
     [SYS_CAP_GRANT] = { "cap_grant",                    2,      V_ERRNO },
@@ -71 +73 @@
     [SYS_PHYSMEM_MAP] = { "physmem_map",                4,      V_ERRNO },
     [SYS_IOSPACE_ENABLE] = { "iospace_enable",          1,      V_ERRNO },
-    [SYS_IRQ_REGISTER] = { "irq_register",      4,      V_ERRNO },
-    [SYS_IRQ_UNREGISTER] = { "irq_unregister",  2,      V_ERRNO },
+
+    [SYS_IPC_IRQ_SUBSCRIBE] = { "ipc_irq_subscribe",    4,      V_ERRNO },
+    [SYS_IPC_IRQ_UNSUBSCRIBE] = { "ipc_irq_unsubscribe",        2,      V_ERRNO },
 
     [SYS_SYSINFO_GET_VAL_TYPE] = { "sysinfo_get_val_type",              2,      V_INTEGER },
@@ -79 +82 @@
     [SYS_SYSINFO_GET_DATA] = { "sysinfo_get_data",              5,      V_ERRNO },
 
-    [SYS_DEBUG_ACTIVATE_CONSOLE] = { "debug_activate_console", 0,       V_ERRNO },
+    [SYS_DEBUG_CONSOLE] = { "debug_console", 0, V_ERRNO },
     [SYS_IPC_CONNECT_KBOX] = { "ipc_connect_kbox",      1,      V_ERRNO }
 };