Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/include/syscall/syscall.h

    rd70d80ed rea28272  
    3838typedef enum {
    3939        SYS_KLOG = 0,
    40         SYS_TLS_SET = 1, /* Hardcoded in AMD64, IA32 uspace - fibril.S */
     40        SYS_TLS_SET = 1,  /* Hardcoded for AMD64, IA-32 (fibril.S in uspace) */
    4141       
    4242        SYS_THREAD_CREATE,
     
    4747        SYS_TASK_GET_ID,
    4848        SYS_TASK_SET_NAME,
     49        SYS_TASK_KILL,
    4950        SYS_PROGRAM_SPAWN_LOADER,
    5051       
     
    7172        SYS_IPC_REGISTER_IRQ,
    7273        SYS_IPC_UNREGISTER_IRQ,
     74        SYS_IPC_CONNECT_KBOX,
    7375       
    7476        SYS_EVENT_SUBSCRIBE,
     
    9092        SYS_DEBUG_DISABLE_CONSOLE,
    9193       
    92         SYS_IPC_CONNECT_KBOX,
    9394        SYSCALL_END
    9495} syscall_t;
     
    9899#include <typedefs.h>
    99100
    100 typedef unative_t (*syshandler_t)(unative_t, unative_t, unative_t, unative_t,
    101     unative_t, unative_t);
     101typedef sysarg_t (*syshandler_t)(sysarg_t, sysarg_t, sysarg_t, sysarg_t,
     102    sysarg_t, sysarg_t);
    102103
    103104extern syshandler_t syscall_table[SYSCALL_END];
    104 extern unative_t syscall_handler(unative_t, unative_t, unative_t, unative_t,
    105     unative_t, unative_t, unative_t);
    106 extern unative_t sys_tls_set(unative_t);
     105extern sysarg_t syscall_handler(sysarg_t, sysarg_t, sysarg_t, sysarg_t,
     106    sysarg_t, sysarg_t, sysarg_t);
     107extern sysarg_t sys_tls_set(sysarg_t);
    107108
    108109#endif
Note: See TracChangeset for help on using the changeset viewer.