Fork us on GitHub Follow us on Facebook Follow us on Twitter

Ignore:
Timestamp:
2010-12-17T08:59:35Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
58854f2
Parents:
70e5ad5 (diff), 11658b64 (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 development/ changes

File:
1 edited

Legend:

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

    r70e5ad5 r5863a95  
    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,
     
    7171        SYS_IPC_REGISTER_IRQ,
    7272        SYS_IPC_UNREGISTER_IRQ,
     73        SYS_IPC_CONNECT_KBOX,
    7374       
    7475        SYS_EVENT_SUBSCRIBE,
     
    9091        SYS_DEBUG_DISABLE_CONSOLE,
    9192       
    92         SYS_IPC_CONNECT_KBOX,
    9393        SYSCALL_END
    9494} syscall_t;
     
    9898#include <typedefs.h>
    9999
    100 typedef unative_t (*syshandler_t)(unative_t, unative_t, unative_t, unative_t,
    101     unative_t, unative_t);
     100typedef sysarg_t (*syshandler_t)(sysarg_t, sysarg_t, sysarg_t, sysarg_t,
     101    sysarg_t, sysarg_t);
    102102
    103103extern 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);
     104extern sysarg_t syscall_handler(sysarg_t, sysarg_t, sysarg_t, sysarg_t,
     105    sysarg_t, sysarg_t, sysarg_t);
     106extern sysarg_t sys_tls_set(sysarg_t);
    107107
    108108#endif
Note: See TracChangeset for help on using the changeset viewer.