diff options
author | Michael Brown | 2005-04-08 17:01:17 +0200 |
---|---|---|
committer | Michael Brown | 2005-04-08 17:01:17 +0200 |
commit | 0ff80b477dcff0726ebdbed95e8a93971e59e82b (patch) | |
tree | 860b7150212a07c24a9529ea072f3fb12700974c /src/core/pc_kbd.c | |
parent | Merged this file into HEAD (diff) | |
download | ipxe-0ff80b477dcff0726ebdbed95e8a93971e59e82b.tar.gz ipxe-0ff80b477dcff0726ebdbed95e8a93971e59e82b.tar.xz ipxe-0ff80b477dcff0726ebdbed95e8a93971e59e82b.zip |
Merged mcb30-realmode-redesign back to HEAD
Diffstat (limited to 'src/core/pc_kbd.c')
-rw-r--r-- | src/core/pc_kbd.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/core/pc_kbd.c b/src/core/pc_kbd.c index 9fe82924..84a3c640 100644 --- a/src/core/pc_kbd.c +++ b/src/core/pc_kbd.c @@ -9,8 +9,9 @@ * 2004-04 moved by LYH From filo to Etherboot * yhlu@tyan.com */ -#ifdef CONSOLE_PC_KBD -#include "etherboot.h" + +#include "io.h" +#include "console.h" static char key_map[][128] = { { @@ -69,14 +70,14 @@ static int get_scancode(void) return scan; } -int kbd_havekey(void) +static int kbd_havekey(void) { if (!cur_scan) cur_scan = get_scancode(); return cur_scan != 0; } -int kbd_ischar(void) +static int kbd_ischar(void) { if (!kbd_havekey()) return 0; @@ -87,7 +88,7 @@ int kbd_ischar(void) return 1; } -int kbd_getc(void) +static int kbd_getc(void) { int c; @@ -105,4 +106,7 @@ int kbd_getc(void) cur_scan = 0; return c; } -#endif + +static struct console_driver pc_kbd_console __console_driver = { + .getchar = kbd_getc, +}; |