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

Timestamp:

2010-12-30T13:43:27Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d770deb

Parents:

d70d80ed (diff), f418e51 (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/include/syscall/syscall.h (modified) (5 diffs)

kernel/generic/include/syscall/syscall.h

@@ -38 +38 @@
 typedef enum {
         SYS_KLOG = 0,
-        SYS_TLS_SET = 1, /* Hardcoded in AMD64, IA32 uspace - fibril.S */
+        SYS_TLS_SET = 1,  /* Hardcoded for AMD64, IA-32 (fibril.S in uspace) */
         
         SYS_THREAD_CREATE,
@@ -47 +47 @@
         SYS_TASK_GET_ID,
         SYS_TASK_SET_NAME,
+        SYS_TASK_KILL,
         SYS_PROGRAM_SPAWN_LOADER,
         
@@ -71 +72 @@
         SYS_IPC_REGISTER_IRQ,
         SYS_IPC_UNREGISTER_IRQ,
+        SYS_IPC_CONNECT_KBOX,
         
         SYS_EVENT_SUBSCRIBE,
@@ -90 +92 @@
         SYS_DEBUG_DISABLE_CONSOLE,
         
-        SYS_IPC_CONNECT_KBOX,
         SYSCALL_END
 } syscall_t;
@@ -98 +99 @@
 #include <typedefs.h>
 
-typedef unative_t (*syshandler_t)(unative_t, unative_t, unative_t, unative_t,
-    unative_t, unative_t);
+typedef sysarg_t (*syshandler_t)(sysarg_t, sysarg_t, sysarg_t, sysarg_t,
+    sysarg_t, sysarg_t);
 
 extern syshandler_t syscall_table[SYSCALL_END];
-extern unative_t syscall_handler(unative_t, unative_t, unative_t, unative_t,
-    unative_t, unative_t, unative_t);
-extern unative_t sys_tls_set(unative_t);
+extern sysarg_t syscall_handler(sysarg_t, sysarg_t, sysarg_t, sysarg_t,
+    sysarg_t, sysarg_t, sysarg_t);
+extern sysarg_t sys_tls_set(sysarg_t);
 
 #endif