Nokia RX-51: Fix double space key press

Space key is indicated by two different bits. Some HW models indicate press
of space key only by the first bit. Qemu indicates it by both bits at the
same time, which is currently interpreted by u-boot as double key press.

Fix this issue by setting first bit when only second is set (to support HW
models which indicate press only by second bit) and always clearing second
bit before processing to not report double space key press.

Signed-off-by: Pali Rohár <pali@kernel.org>

diff --git a/board/nokia/rx51/rx51.c b/board/nokia/rx51/rx51.c
index 9548c3c7be71ab8b7ae4bace4e0284cab328f2ab..c1b4b91b6070e44d5abbfdac653289ba58daf7eb 100644 (file)
--- a/board/nokia/rx51/rx51.c
+++ b/board/nokia/rx51/rx51.c
@@ -561,7 +561,7 @@ static const char keymap[] = {
        'q',  'o',  'p',  ',', '\b',    0,  'a',  's',
        'w',  'd',  'f',  'g',  'h',  'j',  'k',  'l',
        'e',  '.',    0,  '\r',   0,  'z',  'x',  'c',
-       'r',  'v',  'b',  'n',  'm',  ' ',  ' ',    0,
+       'r',  'v',  'b',  'n',  'm',  ' ',    0,    0,
        't',    0,    0,    0,    0,    0,    0,    0,
        'y',    0,    0,    0,    0,    0,    0,    0,
        'u',    0,    0,    0,    0,    0,    0,    0,
@@ -691,6 +691,10 @@ static int rx51_kp_tstc(struct udevice *dev)
                mods = keys[4] >> 4;
                keys[4] &= 0x0f;
 
+               /* space key is indicated by two different bits */
+               keys[3] |= (keys[3] & (1 << 6)) >> 1;
+               keys[3] &= ~(1 << 6);
+
                for (c = 0; c < 8; c++) {
 
                        /* get newly pressed keys only */