Changeset c47e1a8 in mainline for kernel/generic/include/syscall/syscall.h

Timestamp:

2010-05-21T07:50:04Z (15 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

d51ee2b

Parents:

cf8cc36 (diff), 15b592b (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 (rev. 451)

File:

• kernel/generic/include/syscall/syscall.h (modified) (3 diffs)

kernel/generic/include/syscall/syscall.h

@@ -71 +71 @@
         SYS_IPC_REGISTER_IRQ,
         SYS_IPC_UNREGISTER_IRQ,
-
+        
         SYS_EVENT_SUBSCRIBE,
         
@@ -83 +83 @@
         SYS_INTERRUPT_ENABLE,
         
-        SYS_SYSINFO_VALID,
-        SYS_SYSINFO_VALUE,
+        SYS_SYSINFO_GET_TAG,
+        SYS_SYSINFO_GET_VALUE,
+        SYS_SYSINFO_GET_DATA_SIZE,
+        SYS_SYSINFO_GET_DATA,
         
         SYS_DEBUG_ENABLE_CONSOLE,
         SYS_DEBUG_DISABLE_CONSOLE,
+        
         SYS_IPC_CONNECT_KBOX,
         SYSCALL_END
@@ -94 +97 @@
 #ifdef KERNEL
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 typedef unative_t (*syshandler_t)(unative_t, unative_t, unative_t, unative_t,