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/input | |
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/input')
-rw-r--r-- | src/kernel/input/input.h | 4 | ||||
-rw-r--r-- | src/kernel/input/ps2/keyboard.c | 9 |
2 files changed, 0 insertions, 13 deletions
diff --git a/src/kernel/input/input.h b/src/kernel/input/input.h index 9dc9276..172f0ae 100644 --- a/src/kernel/input/input.h +++ b/src/kernel/input/input.h @@ -12,10 +12,6 @@ void mouse_install(); */ void keyboard_install(); -void keyboard_clear_buffer(); - char keyboard_char_buffer; -char *keyboard_buffer; - #endif
\ No newline at end of file diff --git a/src/kernel/input/ps2/keyboard.c b/src/kernel/input/ps2/keyboard.c index 4dc5119..2056045 100644 --- a/src/kernel/input/ps2/keyboard.c +++ b/src/kernel/input/ps2/keyboard.c @@ -108,7 +108,6 @@ void keyboard_handler(struct regs *r) } keyboard_char_buffer = current_keymap[scan_code]; - keyboard_buffer[strlen(keyboard_buffer)] = keyboard_char_buffer; } else { // RELEASE if (current_keymap[scan_code] == (int)0xffffffb5) // TODO: IDK WHY -107?! control_pressed = 0; @@ -128,16 +127,8 @@ void keyboard_rate() outb(0x60, 0x0); // Rate{00000} Delay{00} 0 } -void keyboard_clear_buffer() -{ - // kfree(keyboard_buffer); - keyboard_buffer = (char *)kmalloc(4096); // 4KiB -} - -// Installs the keyboard handler into IRQ1 void keyboard_install() { - keyboard_clear_buffer(); keyboard_rate(); irq_install_handler(1, keyboard_handler); shift_pressed = 0; |