diff options
| author | Rajat Jain <rajatja@google.com> | 2020-01-28 17:26:04 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-03-04 23:06:37 +0000 |
| commit | 447c7594b3eae22c3f59e6824f1aac06f3ae6433 (patch) | |
| tree | dbf83efd9f4ae9799a028a2a17a7e5e67c3ed824 | |
| parent | 85cbad404f0cbbb9300661312340352ff9afd63f (diff) | |
| download | chrome-ec-447c7594b3eae22c3f59e6824f1aac06f3ae6433.tar.gz | |
common/keyboard_8042: When pressed, print F11-F15 for debug
Vivaldi adds support for a new keyboard layout, and more
function keys. The scan matrix is here:
https://drive.google.com/corp/drive/u/1/folders/17UtVQ-AixnlQuicRPTp8t46HE-sT522E
Allow to print F11-F15 labels when debugging those extra keys.
BUG=b:146501925
TEST=Check extra keys by putting debug prints in the EC.
BRANCH=firmware-hatch-12672.B
Signed-off-by: Rajat Jain <rajatja@google.com>
Change-Id: I0714baf4a8981b90aefdd3b955ebf93985f70197
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2080602
Reviewed-by: Scott Collyer <scollyer@chromium.org>
| -rw-r--r-- | common/keyboard_8042_sharedlib.c | 10 | ||||
| -rw-r--r-- | include/keyboard_8042_sharedlib.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/common/keyboard_8042_sharedlib.c b/common/keyboard_8042_sharedlib.c index cdf4f4fd8d..3eebb761e1 100644 --- a/common/keyboard_8042_sharedlib.c +++ b/common/keyboard_8042_sharedlib.c @@ -76,7 +76,7 @@ char * const keycap_long_label[KLLI_MAX & KEYCAP_LONG_LABEL_INDEX_BITMASK] = { "UNKNOWN", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", "F11", - "F12", "F13", "RSVD", "RSVD", + "F12", "F13", "F14", "F15", "L-ALT", "R-ALT", "L-CTR", "R-CTR", "L-SHT", "R-SHT", "ENTER", "SPACE", "B-SPC", "TAB", "SEARC", "LEFT", @@ -89,7 +89,7 @@ SHAREDLIB(const char keycap_label[KEYBOARD_COLS_MAX][KEYBOARD_ROWS] = { {KLLI_UNKNO, KLLI_UNKNO, KLLI_L_CTR, KLLI_SEARC, KLLI_R_CTR, KLLI_UNKNO, KLLI_UNKNO, KLLI_UNKNO}, - {KLLI_SEARC, KLLI_ESC, KLLI_TAB, '~', + {KLLI_F11, KLLI_ESC, KLLI_TAB, '~', 'a', 'z', '1', 'q'}, {KLLI_F1, KLLI_F4, KLLI_F3, KLLI_F2, 'd', 'c', '3', 'e'}, @@ -97,7 +97,7 @@ char keycap_label[KEYBOARD_COLS_MAX][KEYBOARD_ROWS] = { 'f', 'v', '4', 'r'}, {KLLI_F10, KLLI_F7, KLLI_F6, KLLI_F5, 's', 'x', '2', 'w'}, - {KLLI_UNKNO, KLLI_UNKNO, ']', KLLI_UNKNO, + {KLLI_UNKNO, KLLI_F12, ']', KLLI_F13, 'k', ',', '8', 'i'}, {'n', 'h', 'y', '6', 'j', 'm', '7', 'u'}, @@ -105,11 +105,11 @@ char keycap_label[KEYBOARD_COLS_MAX][KEYBOARD_ROWS] = { KLLI_UNKNO, KLLI_L_SHT, KLLI_UNKNO, KLLI_R_SHT}, {'=', '\'', '[', '-', ';', '/', '0', 'p'}, - {KLLI_UNKNO, KLLI_F9, KLLI_F8, KLLI_UNKNO, + {KLLI_F14, KLLI_F9, KLLI_F8, KLLI_UNKNO, '|', '.', '9', 'o'}, {KLLI_R_ALT, KLLI_UNKNO, KLLI_UNKNO, KLLI_UNKNO, KLLI_UNKNO, KLLI_UNKNO, KLLI_L_ALT, KLLI_UNKNO}, - {KLLI_UNKNO, KLLI_B_SPC, KLLI_UNKNO, '\\', + {KLLI_F15, KLLI_B_SPC, KLLI_UNKNO, '\\', KLLI_ENTER, KLLI_SPACE, KLLI_DOWN, KLLI_UP}, {KLLI_UNKNO, KLLI_UNKNO, KLLI_UNKNO, KLLI_UNKNO, KLLI_UNKNO, KLLI_UNKNO, KLLI_RIGHT, KLLI_LEFT}, diff --git a/include/keyboard_8042_sharedlib.h b/include/keyboard_8042_sharedlib.h index a70312f3d8..a82e1f85eb 100644 --- a/include/keyboard_8042_sharedlib.h +++ b/include/keyboard_8042_sharedlib.h @@ -47,8 +47,8 @@ enum keycap_long_label_idx { KLLI_F11 = 0x8B, /* F11 or POWER */ KLLI_F12 = 0x8C, /* F12 or DEV TOOLS */ KLLI_F13 = 0x8D, /* F13 or GOOGLE ASSISTANT */ - KLLI_RSVD4 = 0x8E, - KLLI_RSVD5 = 0x8F, + KLLI_F14 = 0x8E, /* F14 */ + KLLI_F15 = 0x8F, /* F15 */ KLLI_L_ALT = 0x90, /* LEFT ALT */ KLLI_R_ALT = 0x91, /* RIGHT ALT */ KLLI_L_CTR = 0x92, /* LEFT CONTROL */ |