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

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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) (2 diffs)

uspace/app/trace/syscalls.c

@@ -64 +64 @@
     [SYS_IPC_POKE] = { "ipc_poke",                      0,      V_ERRNO },
     [SYS_IPC_HANGUP] = { "ipc_hangup",                  1,      V_ERRNO },
-    [SYS_IPC_REGISTER_IRQ] = { "ipc_register_irq",      4,      V_ERRNO },
-    [SYS_IPC_UNREGISTER_IRQ] = { "ipc_unregister_irq",  2,      V_ERRNO },
 
     [SYS_EVENT_SUBSCRIBE] = { "event_subscribe",        2,      V_ERRNO },
@@ -73 +71 @@
     [SYS_PHYSMEM_MAP] = { "physmem_map",                4,      V_ERRNO },
     [SYS_IOSPACE_ENABLE] = { "iospace_enable",          1,      V_ERRNO },
-    [SYS_INTERRUPT_ENABLE] = { "interrupt_enable",      2,      V_ERRNO },
+    [SYS_REGISTER_IRQ] = { "register_irq",      4,      V_ERRNO },
+    [SYS_UNREGISTER_IRQ] = { "unregister_irq",  2,      V_ERRNO },
 
     [SYS_SYSINFO_GET_TAG] = { "sysinfo_get_tag",                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",              4,      V_ERRNO },
+    [SYS_SYSINFO_GET_DATA] = { "sysinfo_get_data",              5,      V_ERRNO },
 
     [SYS_DEBUG_ENABLE_CONSOLE] = { "debug_enable_console", 0,   V_ERRNO },