From 3658d88f13ccc807d0eb25d92b66e11c3c6b7272 Mon Sep 17 00:00:00 2001 From: John Hodge Date: Mon, 15 Jul 2013 10:17:57 +0800 Subject: [PATCH] AcessNative/kernel - Fixed badly ordered syscalls --- AcessNative/acesskernel_src/syscalls.c | 42 ++++++++++++++------------ 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/AcessNative/acesskernel_src/syscalls.c b/AcessNative/acesskernel_src/syscalls.c index f19fe69c..4194a36a 100644 --- a/AcessNative/acesskernel_src/syscalls.c +++ b/AcessNative/acesskernel_src/syscalls.c @@ -119,7 +119,7 @@ SYSCALL3(Syscall_Read, "iid", int, int, void *, ); SYSCALL3(Syscall_Write, "iid", int, int, const void *, if( Sizes[2] < a1 ) { - Log_Warning("Syscalls", "Write - %i < %i", Sizes[2], a1); + Log_Warning("Syscalls", "Write - %x < %x", (int)Sizes[2], (int)a1); *Errno = EINVAL; return -1; } @@ -236,26 +236,28 @@ SYSCALL1(Syscall_WaitEvent, "i", int, ); const tSyscallHandler caSyscalls[] = { - Syscall_Null, - Syscall_Exit, - Syscall_Open, - Syscall_Close, - Syscall_Read, - Syscall_Write, - Syscall_Seek, - Syscall_Tell, - Syscall_IOCtl, - Syscall_FInfo, - Syscall_ReadDir, - Syscall_OpenChild, - Syscall_GetACL, - Syscall_Mount, - NULL, // SYS_REOPEN - Syscall_Chdir, + [SYS_NULL] = Syscall_Null, + [SYS_EXIT] = Syscall_Exit, + [SYS_OPEN] = Syscall_Open, + [SYS_CLOSE] = Syscall_Close, + [SYS_COPYFD] = NULL, + [SYS_FDFLAGS] = NULL, + [SYS_READ] = Syscall_Read, + [SYS_WRITE] = Syscall_Write, + [SYS_SEEK] = Syscall_Seek, + [SYS_TELL] = Syscall_Tell, + [SYS_IOCTL] = Syscall_IOCtl, + [SYS_FINFO] = Syscall_FInfo, + [SYS_READDIR] = Syscall_ReadDir, + [SYS_OPENCHILD] = Syscall_OpenChild, + [SYS_GETACL] = Syscall_GetACL, + [SYS_MOUNT] = Syscall_Mount, + [SYS_REOPEN] = NULL, // SYS_REOPEN + [SYS_CHDIR] = Syscall_Chdir, - Syscall_WaitTID, - Syscall_SetUID, - Syscall_SetGID, + [SYS_WAITTID] = Syscall_WaitTID, + [SYS_SETUID] = Syscall_SetUID, + [SYS_SETGID] = Syscall_SetGID, Syscall_GetTID, Syscall_GetPID, -- 2.20.1