From 0a90861ff2308cf03928dbe5b7c4d3dfde82ceb4 Mon Sep 17 00:00:00 2001 From: Dave Frodin Date: Tue, 27 Nov 2012 16:02:41 -0700 Subject: libpayload: Don't let USB/PC/serial keyboards overwrite each other Change-Id: I75c0066cf737e0cecac056487215622e2b3d4467 Signed-off-by: Dave Frodin Reviewed-on: http://review.coreboot.org/1981 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- payloads/libpayload/curses/pdcurses-backend/pdckbd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'payloads') diff --git a/payloads/libpayload/curses/pdcurses-backend/pdckbd.c b/payloads/libpayload/curses/pdcurses-backend/pdckbd.c index 4558406ea3..49b80c74fc 100644 --- a/payloads/libpayload/curses/pdcurses-backend/pdckbd.c +++ b/payloads/libpayload/curses/pdcurses-backend/pdckbd.c @@ -149,14 +149,14 @@ int PDC_get_key(void) #ifdef CONFIG_PC_KEYBOARD if ((curses_flags & F_ENABLE_CONSOLE) && - keyboard_havechar()) { + keyboard_havechar() && (c==0)) { c = keyboard_getchar(); } #endif #ifdef CONFIG_SERIAL_CONSOLE if ((curses_flags & F_ENABLE_SERIAL) && - serial_havechar()) { + serial_havechar() && (c==0)) { c = cook_serial(serial_getchar()); } #endif -- cgit v1.2.3