Changeset 15d0046 in mainline for abi/include/abi/syscall.h

Timestamp:

2014-09-12T13:22:33Z (11 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:

• abi/include/abi/syscall.h (modified) (3 diffs)

abi/include/abi/syscall.h

@@ -74 +74 @@
         SYS_IPC_CONNECT_KBOX,
         
-        SYS_EVENT_SUBSCRIBE,
-        SYS_EVENT_UNMASK,
+        SYS_IPC_EVENT_SUBSCRIBE,
+        SYS_IPC_EVENT_UNSUBSCRIBE,
+        SYS_IPC_EVENT_UNMASK,
         
         SYS_CAP_GRANT,
@@ -87 +88 @@
         SYS_IOSPACE_ENABLE,
         SYS_IOSPACE_DISABLE,
-        SYS_IRQ_REGISTER,
-        SYS_IRQ_UNREGISTER,
+        
+        SYS_IPC_IRQ_SUBSCRIBE,
+        SYS_IPC_IRQ_UNSUBSCRIBE,
         
         SYS_SYSINFO_GET_KEYS_SIZE,
@@ -97 +99 @@
         SYS_SYSINFO_GET_DATA,
         
-        SYS_DEBUG_ACTIVATE_CONSOLE,
+        SYS_DEBUG_CONSOLE,
         
         SYS_KLOG,