@@ -21,13 +21,11 @@ #include <drivers/kb.h> #include <isr.h> #include <lib/kprintf.h> -#include <drivers/video/textvideo.h> #include <irq.h> #include <procio.h> #include <driver.h> #include <kmalloc.h> - -extern video_t video_funcs; +#include <lib/linked_list.h> /* A look-up table for all of our keypress values */ static unsigned char keyboard_map[128] = { @@ -45,6 +43,7 @@ static unsigned char keyboard_map[128] = { }; keyboard_status_t *kb_status; +ll_t *callbacks; static void kb_loop(){ while(read_byte(0x64)&0x02); @@ -114,17 +113,29 @@ void keyboard_handler(stack_rep_t *rep){ do_leds(); break; default:{ - video_funcs.write_char(key); - video_funcs.refresh(); + ll_node_t *x = callbacks->head; + while(x){ + ((keyboard_callback_p)x->data)(key); + x = x->next; + } } } } } +int keyboard_add_callback(keyboard_callback_p x){ + return ll_add(callbacks, x); +} + +int keyboard_remove_callback(keyboard_callback_p x){ + return ll_remove(callbacks, x); +} + driver_t *keyboard_install(){ /* Install the keyboard to IRQ #1 */ irq_create_handler(1, keyboard_handler); kb_status = kmalloc(sizeof(kb_status)); + callbacks = ll_create(); return driver_started("keyboard", 1, DRIVER_INIT_SUCCESSFUL); } src/drivers/kb.c @@ -23,6 +23,7 @@ #include <lib/string.h> #include <drivers/video/textvideo.h> #include <driver.h> +#include <drivers/kb.h> #define TAB_SIZE 8*8 /* XXX: This could possibly be made dynamic */ @@ -69,7 +70,8 @@ video_t video_funcs = { vbe_get_foreground_color, vbe_get_background_color, vbe_refresh, - vbe_update_cursor + vbe_update_cursor, + vbe_keyboard_callback }; extern unsigned char font[256*8]; @@ -300,3 +302,8 @@ void vbe_update_cursor(int dy, int dx){ vbe_refresh(); } +void vbe_keyboard_callback(int key){ + vbe_write_char(key); + vbe_refresh(); +} + src/drivers/video/tvbe.c @@ -92,7 +92,11 @@ typedef struct keyboard_status { int status; } keyboard_status_t; +typedef void (*keyboard_callback_p)(int); + void keyboard_handler(stack_rep_t *); driver_t *keyboard_install(); +int keyboard_add_callback(keyboard_callback_p); +int keyboard_remove_callback(keyboard_callback_p); #endif src/include/drivers/kb.h @@ -51,6 +51,7 @@ typedef struct { uint8_t (*get_bg_color)(void); void (*refresh)(void); void (*update_cursor)(int, int); + void (*keyboard_callback)(int); } video_t; #endif src/include/drivers/video/textvideo.h @@ -53,4 +53,6 @@ void vbe_refresh(void); void vbe_update_cursor(int, int); +void vbe_keyboard_callback(int); + #endif src/include/drivers/video/tvbe.h @@ -102,6 +102,8 @@ void init(unsigned long magic, unsigned long addr) { kprintf("\tExtended Model: %i\n", cpu_info->ext_model); kprintf("\tExtended Family: %i\n", cpu_info->ext_family); + keyboard_add_callback(video_funcs.keyboard_callback); + __asm__ __volatile__("sti"); while (1) { src/init/main.c e7c61ff67be2d9a32c8499f0246dafdd0699ac9c Andrew Etches seadog@mehmoo.com http://github.com/seadog/kaiser/commit/79c4814dfdb12170005317adb150dbc5126adeb1 79c4814dfdb12170005317adb150dbc5126adeb1 2009-05-15T14:32:40-07:00 2009-05-15T14:32:40-07:00 Added keyboard callbacks so more than one device can grab the keyboard input, also decentralised the keyboard system so that the keyboard driver doesn't have to call video functions directly, they now use callbacks c7581e297d42452a395a14439ef76574c16a2981 Andrew Etches seadog@mehmoo.com