diff options
| author | Dave Parker <dparker@chromium.org> | 2013-08-12 15:01:34 -0700 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-06-13 07:51:00 +0000 |
| commit | 4424bbc99288f0ed804394a6646a3ef01fd6bc9f (patch) | |
| tree | fe62ae5ddf9b25d4cfc2324a9c5081d0860aaf17 | |
| parent | aa51390f9eabaf9681b5535d43d43281c0a14601 (diff) | |
| download | chrome-ec-4424bbc99288f0ed804394a6646a3ef01fd6bc9f.tar.gz | |
CHERRY-PICK:Update keyboard scanmatrix for Japanese keyboards.
BUG=chrome-os-partner:29545
BRANCH=wolf
TEST=Run evtest. Push every key. Verify correct key code
reported.
Change-Id: I6f9eb2ca6fca4750ed1f826c16be484f6f618c18
Signed-off-by: Henry Hsu <Henry.Hsu@quantatw.com>
Original-Change-Id: Ic6e4a38608f4bc8c66f487998912a7921ddb03cb
Reviewed-on: https://chromium-review.googlesource.com/65623
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Reviewed-by: Yung-chieh Lo <yjlou@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/203602
Reviewed-by: Mohammed Habibulla <moch@chromium.org>
Reviewed-by: Dave Parker <dparker@chromium.org>
| -rw-r--r-- | common/keyboard_8042.c | 12 | ||||
| -rw-r--r-- | common/keyboard_scan.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/common/keyboard_8042.c b/common/keyboard_8042.c index 6fd2524bad..53349c5a2f 100644 --- a/common/keyboard_8042.c +++ b/common/keyboard_8042.c @@ -156,11 +156,11 @@ static const uint16_t scancode_set1[KEYBOARD_ROWS][KEYBOARD_COLS] = { {0x0000, 0xe05b, 0x003b, 0x0030, 0x0044, 0x0073, 0x0031, 0x0000, 0x000d, 0x0000, 0xe038, 0x0000, 0x0000}, {0x0000, 0x0001, 0x003e, 0x0022, 0x0041, 0x0000, 0x0023, 0x0000, 0x0028, - 0x0043, 0x0000, 0x000e, 0x0078}, + 0x0043, 0x0000, 0x000e, 0x0079}, {0x001d, 0x000f, 0x003d, 0x0014, 0x0040, 0x001b, 0x0015, 0x0056, 0x001a, - 0x0042, 0x0073, 0x0000, 0x0000}, + 0x0042, 0x007d, 0x0000, 0x0000}, {0x0000, 0x0029, 0x003c, 0x0006, 0x003f, 0x0000, 0x0007, 0x0000, 0x000c, - 0x0000, 0x0000, 0x002b, 0x0079}, + 0x0000, 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, @@ -175,11 +175,11 @@ static const uint16_t scancode_set2[KEYBOARD_ROWS][KEYBOARD_COLS] = { {0x0000, 0xe01f, 0x0005, 0x0032, 0x0009, 0x0051, 0x0031, 0x0000, 0x0055, 0x0000, 0xe011, 0x0000, 0x0000}, {0x0000, 0x0076, 0x000c, 0x0034, 0x0083, 0x0000, 0x0033, 0x0000, 0x0052, - 0x0001, 0x0000, 0x0066, 0x0067}, + 0x0001, 0x0000, 0x0066, 0x0064}, {0x0014, 0x000d, 0x0004, 0x002c, 0x000b, 0x005b, 0x0035, 0x0061, 0x0054, - 0x000a, 0x0051, 0x0000, 0x0000}, + 0x000a, 0x006a, 0x0000, 0x0000}, {0x0000, 0x000e, 0x0006, 0x002e, 0x0003, 0x0000, 0x0036, 0x0000, 0x004e, - 0x0000, 0x0000, 0x005d, 0x0064}, + 0x0000, 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 7685293a47..8214d7c415 100644 --- a/common/keyboard_scan.c +++ b/common/keyboard_scan.c @@ -38,7 +38,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, 0xc8 /* full set */ + 0xa4, 0xff, 0xf6, 0x55, 0xfa, 0xca /* full set */ }, }; #endif |