summaryrefslogtreecommitdiff
path: root/src/pc80/keyboard.c
diff options
context:
space:
mode:
authorScott Duplichan <scott@notabs.org>2010-09-09 20:37:00 +0000
committerMarc Jones <marc.jones@amd.com>2010-09-09 20:37:00 +0000
commit9c934d1d468fca0fd955e869324f5846426e1b32 (patch)
tree229bbd62a60549fba84b0d77f971a5d94e955b34 /src/pc80/keyboard.c
parent8f8a51cded3338327059dc9e87e4e8a3519793f2 (diff)
This patch avoids a timeout during PS/2 keyboard
initialization. It can reduce KBC init time by up to 400 ms on real hardware, and by a minute or so on AMD simnow. Signed-off-by: Scott Duplichan <scott@notabs.org> Acked-by: Marc Jones <marcj303@gmail.com> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5798 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/pc80/keyboard.c')
-rw-r--r--src/pc80/keyboard.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pc80/keyboard.c b/src/pc80/keyboard.c
index 9dadf0e39a..8552860b6f 100644
--- a/src/pc80/keyboard.c
+++ b/src/pc80/keyboard.c
@@ -244,7 +244,7 @@ void pc_keyboard_init(struct pc_keyboard *keyboard)
outb(0x60, KBD_COMMAND);
if (!kbc_input_buffer_empty()) return;
outb(0x61, KBD_DATA); /* send cmd: enable keyboard and IRQ 1 */
- if (kbc_output_buffer_full()) {
+ if (!kbc_input_buffer_empty()) {
printk(BIOS_ERR, "Timeout during final keyboard enable\n");
return;
}