2008-01-19 Robert Millan <rmh@aybabtu.com>

* include/grub/i386/linuxbios/console.h: Add header protection.
        (grub_keyboard_controller_init): New function prototype.
        * term/i386/pc/at_keyboard.c (KEYBOARD_COMMAND_ISREADY): New macro.
        (KEYBOARD_COMMAND_READ): Likewise.
        (KEYBOARD_COMMAND_WRITE): Likewise.
        (KEYBOARD_SCANCODE_SET1): Likewise.
        (grub_keyboard_controller_write): New function.
        (grub_keyboard_controller_read): Likewise.
        (grub_keyboard_controller_init): Likewise.

        * term/i386/pc/console.c: Include `<grub/machine/machine.h>'.
        (grub_console_init): On coreboot/LinuxBIOS, call
        grub_keyboard_controller_init().
This commit is contained in:
robertmh 2008-01-19 11:44:27 +00:00
parent 5f5a7c1518
commit 59f1fd8de8
4 changed files with 76 additions and 2 deletions

View file

@ -1,6 +1,6 @@
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 2002,2003,2005,2007 Free Software Foundation, Inc.
* Copyright (C) 2002,2003,2005,2007,2008 Free Software Foundation, Inc.
*
* GRUB is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -16,6 +16,7 @@
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
*/
#include <grub/machine/machine.h>
#include <grub/machine/console.h>
#include <grub/term.h>
#include <grub/types.h>
@ -148,6 +149,10 @@ static struct grub_term grub_console_term =
void
grub_console_init (void)
{
#ifdef GRUB_MACHINE_LINUXBIOS
grub_keyboard_controller_init ();
#endif
grub_term_register (&grub_console_term);
grub_term_set_current (&grub_console_term);
}