diff options
author | Andreas Baumann <mail@andreasbaumann.cc> | 2017-07-20 09:31:30 +0200 |
---|---|---|
committer | Andreas Baumann <mail@andreasbaumann.cc> | 2017-07-20 09:31:30 +0200 |
commit | 7eae4edb86fc65b2e99bf81757aeb00392d8a60d (patch) | |
tree | 2ee5c92be2ca55dcd30dc3e9632bcfa4dfd9a095 /src/kernel | |
parent | 43fcc1ca57149c5a87502f0c23a2c85e4d28264a (diff) | |
download | abaos-7eae4edb86fc65b2e99bf81757aeb00392d8a60d.tar.gz abaos-7eae4edb86fc65b2e99bf81757aeb00392d8a60d.tar.bz2 |
added a virtual keyboard driver interface, made the PS/2 keyboard a specialization of it
Diffstat (limited to 'src/kernel')
-rw-r--r-- | src/kernel/kernel.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c index 9bb1054..91d9988 100644 --- a/src/kernel/kernel.c +++ b/src/kernel/kernel.c @@ -11,7 +11,7 @@ #include "stdio.h" #include "interrupts.h" #include "driver.h" -#include "keyboard.h" +#include "ps2keyboard.h" #include "ps2mouse.h" #include "pci.h" #include "memorymanagement.h" @@ -129,8 +129,8 @@ void kernel_main( void ) // hard-wired drivers - global_context.keyboard = (keyboard_t *)malloc( sizeof( keyboard_t ) ); - keyboard_init( global_context.keyboard, &handle_keyboard_event, &interrupt, (void *)&global_context ); + global_context.keyboard = (keyboard_t *)malloc( sizeof( ps2keyboard_t ) ); + ps2keyboard_init( (ps2keyboard_t *)global_context.keyboard, &handle_keyboard_event, &interrupt, (void *)&global_context ); driver_manager_add_driver( &global_context.driver_manager, (driver_t *)global_context.keyboard ); global_context.mouse = (mouse_t *)malloc( sizeof( ps2mouse_t ) ); |