GNUBoot/coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] libpayload: Bail if the keyboard controller isn't there

Browse source 
If the system in question does not have a superIO, then a read of
0x64 will return 0xFF and we will loop forever.

Signed-off-by: Jordan Crouse <jordan.crouse@amd.com>
Acked-by: Patrick Georgi <patrick.georgi@coresystems.de>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3675 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Jordan Crouse 2008-10-20 17:07:26 +00:00
parent 6744231197
commit ec6363dc48
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
payloads/libpayload/drivers/keyboard.c
View file

@ -175,11 +175,10 @@ static void keyboard_cmd(unsigned char cmd, unsigned char val)
while (inb(0x64) & 2); while (inb(0x64) & 2);
} }
int keyboard_havechar(void) int keyboard_havechar(void)
{ {
unsigned char c = inb(0x64); unsigned char c = inb(0x64);
return c & 1; return (c == 0xFF) ? 0 : c & 1;
} }
unsigned char keyboard_get_scancode(void) unsigned char keyboard_get_scancode(void)
@ -332,6 +331,12 @@ void keyboard_init(void)
u8 mode; u8 mode;
map = &keyboard_layouts[0]; map = &keyboard_layouts[0];
/* If 0x64 returns 0xff, then we have no keyboard
* controller */
if (inb(0x64) == 0xFF)
return;
/* Empty keyboard buffer */ /* Empty keyboard buffer */
while (keyboard_havechar()) keyboard_getchar(); while (keyboard_havechar()) keyboard_getchar();