diff options
| author | Marvin Borner | 2020-04-28 20:59:57 +0200 |
|---|---|---|
| committer | Marvin Borner | 2020-04-28 20:59:57 +0200 |
| commit | 5f8b5ce7efb7738eaebad43f9648975788ae19ff (patch) | |
| tree | ab8fc4d4baa4adb99dc90461df689650acf34cef /src/kernel/syscall/syscall.c | |
| parent | bfe16de4be67565f1a1e7b1331fcbe3aedf9c54e (diff) | |
Fixed userspace entering...
Many other fixes too, but I won't mention them because I don't want to
:)
Diffstat (limited to 'src/kernel/syscall/syscall.c')
| -rw-r--r-- | src/kernel/syscall/syscall.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/kernel/syscall/syscall.c b/src/kernel/syscall/syscall.c index f883f2e..a106f07 100644 --- a/src/kernel/syscall/syscall.c +++ b/src/kernel/syscall/syscall.c @@ -3,20 +3,19 @@ #include <kernel/interrupts/interrupts.h> #include <kernel/system.h> #include <kernel/lib/stdio.h> +#include <kernel/io/io.h> -typedef uint32_t (*syscall_func)(unsigned int, ...); +typedef uint32_t (*syscall_func)(uint32_t, ...); uint32_t (*syscalls[])() = { [0] = (uint32_t(*)())halt_loop, // DEBUG! - [1] = sys_write, - [2] = sys_read, - [3] = (uint32_t(*)())sys_writec, - [4] = sys_readc, - [5] = sys_get_pointers, - [6] = sys_alloc, - [7] = sys_free }; + [1] = sys_putch, + [2] = sys_getch, + [3] = sys_malloc, + [4] = sys_free }; void syscall_handler(struct regs *r) { + sti(); log("Received syscall!"); if (r->eax >= sizeof(syscalls) / sizeof(*syscalls)) @@ -35,4 +34,4 @@ void syscall_handler(struct regs *r) void syscalls_install() { isr_install_handler(0x80, syscall_handler); -} +}
\ No newline at end of file |