Changeset 6843a9c in mainline for uspace/app/trace/syscalls.c

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• uspace/app/trace/syscalls.c (modified) (1 diff)

uspace/app/trace/syscalls.c

@@ -72 +72 @@
     [SYS_PHYSMEM_MAP] = { "physmem_map",                4,      V_ERRNO },
     [SYS_IOSPACE_ENABLE] = { "iospace_enable",          1,      V_ERRNO },
-    [SYS_REGISTER_IRQ] = { "register_irq",      4,      V_ERRNO },
-    [SYS_UNREGISTER_IRQ] = { "unregister_irq",  2,      V_ERRNO },
+    [SYS_IRQ_REGISTER] = { "irq_register",      4,      V_ERRNO },
+    [SYS_IRQ_UNREGISTER] = { "irq_unregister",  2,      V_ERRNO },
 
     [SYS_SYSINFO_GET_VAL_TYPE] = { "sysinfo_get_val_type",              2,      V_INTEGER },