commit 0a90861ff2308cf03928dbe5b7c4d3dfde82ceb4
author Dave Frodin <dave.frodin@se-eng.com> Tue Nov 27 16:02:41 2012 -0700
committer Marc Jones <marcj303@gmail.com> Fri Dec 07 20:41:46 2012 +0100
tree b38fdbfd3331bb4b9f31a98d0b2cd67cf5af56b9
parent 67ce04ea9a9c7e30dd96b9f36a938b51655e8a44

libpayload: Don't let USB/PC/serial keyboards overwrite each other

Change-Id: I75c0066cf737e0cecac056487215622e2b3d4467
Signed-off-by: Dave Frodin <dave.frodin@se-eng.com>
Reviewed-on: http://review.coreboot.org/1981
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>

payloads/libpayload/curses/pdcurses-backend/pdckbd.c

diff --git a/payloads/libpayload/curses/pdcurses-backend/pdckbd.c b/payloads/libpayload/curses/pdcurses-backend/pdckbd.c
index 4558406..49b80c7 100644
--- a/payloads/libpayload/curses/pdcurses-backend/pdckbd.c
+++ b/payloads/libpayload/curses/pdcurses-backend/pdckbd.c
@@ -149,14 +149,14 @@
 
 #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