diff options
| author | Dave Parker <dparker@chromium.org> | 2014-01-06 16:33:17 -0800 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-01-14 03:29:50 +0000 |
| commit | 8da44f83faf25ae12a28b4c682b9417ed5130ab9 (patch) | |
| tree | 8fde376f2c2bd522fb033d9594ceb4e482f14050 | |
| parent | 7c02461c5e582ac5e7643f26401e5e1ffd5af55c (diff) | |
| download | chrome-ec-8da44f83faf25ae12a28b4c682b9417ed5130ab9.tar.gz | |
Add F13 to 8042 keyboard scan matrix
F13 is used to trigger the lock/password screen
for users logged into Chromium OS. F13 is already
used for this purpose on the USB Chrome keyboard.
BUG=chrome-os-partner:24376
BRANCH=clapper,glimmer
TEST=Run "kbpress 9 3 1" to simulate keypress.
Verify lock screen is entered in Chromium OS.
Set1:
Run evtest. Verify KEY_F13 scan code, value=5d
Set2:
Add kernel parameter "i8042.direct=1" to use RAW mode.
Run evtest. Verify KEY_F13 scan code, value=2f
Change-Id: I71200810681f683c17e30b383e1221784deae0cd
Signed-off-by: Dave Parker <dparker@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/182289
| -rw-r--r-- | common/keyboard_8042.c | 4 | ||||
| -rw-r--r-- | common/keyboard_scan.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/common/keyboard_8042.c b/common/keyboard_8042.c index c3791e0068..dff695fbdb 100644 --- a/common/keyboard_8042.c +++ b/common/keyboard_8042.c @@ -159,7 +159,7 @@ static const uint16_t scancode_set1[KEYBOARD_ROWS][KEYBOARD_COLS] = { {0x001d, 0x000f, 0x003d, 0x0014, 0x0040, 0x001b, 0x0015, 0x0056, 0x001a, 0x0042, 0x007d, 0x0000, 0x0000}, {0x0000, 0x0029, 0x003c, 0x0006, 0x003f, 0x0000, 0x0007, 0x0000, 0x000c, - 0x0000, 0x0000, 0x002b, 0x007b}, + 0x005d, 0x0000, 0x002b, 0x007b}, {0xe01d, 0x001e, 0x0020, 0x0021, 0x001f, 0x0025, 0x0024, 0x0000, 0x0027, 0x0026, 0x002b, 0x001c, 0x0000}, {0x0000, 0x002c, 0x002e, 0x002f, 0x002d, 0x0033, 0x0032, 0x002a, 0x0035, @@ -178,7 +178,7 @@ static const uint16_t scancode_set2[KEYBOARD_ROWS][KEYBOARD_COLS] = { {0x0014, 0x000d, 0x0004, 0x002c, 0x000b, 0x005b, 0x0035, 0x0061, 0x0054, 0x000a, 0x006a, 0x0000, 0x0000}, {0x0000, 0x000e, 0x0006, 0x002e, 0x0003, 0x0000, 0x0036, 0x0000, 0x004e, - 0x0000, 0x0000, 0x005d, 0x0067}, + 0x002f, 0x0000, 0x005d, 0x0067}, {0xe014, 0x001c, 0x0023, 0x002b, 0x001b, 0x0042, 0x003b, 0x0000, 0x004c, 0x004b, 0x005d, 0x005a, 0x0000}, {0x0000, 0x001a, 0x0021, 0x002a, 0x0022, 0x0041, 0x003a, 0x0012, 0x004a, diff --git a/common/keyboard_scan.c b/common/keyboard_scan.c index a22c43b7c7..e5627ba22f 100644 --- a/common/keyboard_scan.c +++ b/common/keyboard_scan.c @@ -51,7 +51,7 @@ struct keyboard_scan_config keyscan_config = { .poll_timeout_us = 100 * MSEC, .actual_key_mask = { 0x14, 0xff, 0xff, 0xff, 0xff, 0xf5, 0xff, - 0xa4, 0xff, 0xf6, 0x55, 0xfa, 0xca /* full set */ + 0xa4, 0xff, 0xfe, 0x55, 0xfa, 0xca /* full set */ }, }; #endif |