diff options
| author | Marvin Borner | 2020-01-26 18:41:23 +0100 |
|---|---|---|
| committer | GitHub | 2020-01-26 18:41:23 +0100 |
| commit | 43f501c74aa09f18c904ace902dc4cc5d241c218 (patch) | |
| tree | ea30b53ac6043faddd1cdb2fdea17f37178b1cc7 /src/kernel/input/ps2/keyboard.c | |
| parent | d5d1749257ff8b9aa6b5ace4b4720b484a2860f3 (diff) | |
| parent | bb2a6b4d93512e8afc1b1999eb58f1f506cc27ae (diff) | |
Merged task-based userspace switching and updated heap/paging code
Awesome!
Diffstat (limited to 'src/kernel/input/ps2/keyboard.c')
| -rw-r--r-- | src/kernel/input/ps2/keyboard.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/kernel/input/ps2/keyboard.c b/src/kernel/input/ps2/keyboard.c index 4cbbf04..3c4ef0a 100644 --- a/src/kernel/input/ps2/keyboard.c +++ b/src/kernel/input/ps2/keyboard.c @@ -2,8 +2,8 @@ #include <kernel/io/io.h> #include <kernel/graphics/vesa.h> #include <kernel/input/input.h> -#include <kernel/lib/stdlib/liballoc.h> #include <kernel/lib/string.h> +#include <kernel/memory/kheap.h> int shift_pressed; int control_pressed; @@ -126,8 +126,8 @@ void keyboard_rate() void keyboard_clear_buffer() { - ufree(keyboard_buffer); - keyboard_buffer = (char *) umalloc(4096); // 4KiB + kfree(keyboard_buffer); + keyboard_buffer = (char *) kmalloc(4096); // 4KiB } // Installs the keyboard handler into IRQ1 |