Changeset 15d0046 in mainline for kernel/generic/src/syscall/syscall.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:

• kernel/generic/src/syscall/syscall.c (modified) (3 diffs)

kernel/generic/src/syscall/syscall.c

@@ -165 +165 @@
         
         /* Event notification syscalls. */
-        (syshandler_t) sys_event_subscribe,
-        (syshandler_t) sys_event_unmask,
+        (syshandler_t) sys_ipc_event_subscribe,
+        (syshandler_t) sys_ipc_event_unsubscribe,
+        (syshandler_t) sys_ipc_event_unmask,
         
         /* Capabilities related syscalls. */
@@ -180 +181 @@
         (syshandler_t) sys_iospace_enable,
         (syshandler_t) sys_iospace_disable,
-        (syshandler_t) sys_irq_register,
-        (syshandler_t) sys_irq_unregister,
+        
+        (syshandler_t) sys_ipc_irq_subscribe,
+        (syshandler_t) sys_ipc_irq_unsubscribe,
         
         /* Sysinfo syscalls. */
@@ -192 +194 @@
         
         /* Kernel console syscalls. */
-        (syshandler_t) sys_debug_activate_console,
+        (syshandler_t) sys_debug_console,
         
         (syshandler_t) sys_klog,