diff options
author | Marvin Borner | 2020-05-13 21:28:56 +0200 |
---|---|---|
committer | Marvin Borner | 2020-05-13 22:12:41 +0200 |
commit | a9c7529dcca845d98192ece62be70f752972216b (patch) | |
tree | 666d49ceb411a669abe6191151b2238fd7156c30 /src/kernel/input | |
parent | e1a6ed079303dc7d218f1d5326a13b6755781271 (diff) |
Replaced alloc.h with liballoc
And many more adaptions to the lib
Diffstat (limited to 'src/kernel/input')
-rw-r--r-- | src/kernel/input/ps2/keyboard.c | 2 | ||||
-rw-r--r-- | src/kernel/input/ps2/mouse.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/kernel/input/ps2/keyboard.c b/src/kernel/input/ps2/keyboard.c index 2ed825a..60ec3df 100644 --- a/src/kernel/input/ps2/keyboard.c +++ b/src/kernel/input/ps2/keyboard.c @@ -12,7 +12,7 @@ u8 scancode; void keyboard_handler(struct regs *r) { scancode = inb(0x60); - struct keyboard_event *event = umalloc(sizeof(struct keyboard_event)); + struct keyboard_event *event = malloc(sizeof(struct keyboard_event)); event->scancode = scancode; event_trigger(MAP_KEYBOARD, (u8 *)event); } diff --git a/src/kernel/input/ps2/mouse.c b/src/kernel/input/ps2/mouse.c index f0b98df..b86ca99 100644 --- a/src/kernel/input/ps2/mouse.c +++ b/src/kernel/input/ps2/mouse.c @@ -90,7 +90,7 @@ char mouse_read() void mouse_install() { - event = umalloc(sizeof(struct mouse_event)); + event = malloc(sizeof(struct mouse_event)); u8 status; // Enable auxiliary mouse device |