[coreboot] New patch to review for coreboot: a279368 libpayload: Don't let USB/PC/serial keyboards overwrite each other

[Dave Frodin]

Dave Frodin ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1981

-gerrit

commit a27936863a9ac7348e609706959e6aa55fd98f21
Author: Dave Frodin 
Date:   Tue Nov 27 16:02:41 2012 -0700

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

Change-Id: I75c0066cf737e0cecac056487215622e2b3d4467
    Signed-off-by: Dave Frodin 
---
 payloads/libpayload/curses/pdcurses-backend/pdckbd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 @@ 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