diff options
| author | Daisuke Nojiri <dnojiri@chromium.org> | 2018-12-06 11:35:00 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-01-22 21:05:27 -0800 |
| commit | a9c83eb7152cb76dbc1a5afdf74ec5213162cc47 (patch) | |
| tree | f83488c6b44d60fee2eba10c90cf3833754ec2b1 /board/nami | |
| parent | 35f64509fc74a99c147249fd06392d9c3abdc807 (diff) | |
| download | chrome-ec-a9c83eb7152cb76dbc1a5afdf74ec5213162cc47.tar.gz | |
Nami: Re-enable search key scanning on Syndra
Search key coordinate was moved to col=0,row=3 on Ekko and Bard and
CL 1343640 was merged to adjust the scan mask.
Syndra doesn't have this move. So, this patch will make the search
key scanned like before while keeping the previous change applied to
only Ekko & Bard.
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
BUG=b:119798830
BRANCH=none
TEST=Verify search key works on Syndra, Sona, Ekko, and Bard.
Change-Id: Ia672383ca8df8e2e212c8c9deb0410c968e357e4
Reviewed-on: https://chromium-review.googlesource.com/c/1366300
Reviewed-by: Jett Rink <jettrink@chromium.org>
Commit-Queue: Daisuke Nojiri <dnojiri@chromium.org>
Tested-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1426152
Commit-Ready: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'board/nami')
| -rw-r--r-- | board/nami/board.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/board/nami/board.c b/board/nami/board.c index ba64053576..d1436bf186 100644 --- a/board/nami/board.c +++ b/board/nami/board.c @@ -959,7 +959,7 @@ struct keyboard_scan_config keyscan_config = { .min_post_scan_delay_us = 1000, .poll_timeout_us = 100 * MSEC, .actual_key_mask = { - 0x1c, 0xfe, 0xff, 0xff, 0xff, 0xf5, 0xff, + 0x14, 0xff, 0xff, 0xff, 0xff, 0xf5, 0xff, 0xa4, 0xff, 0xfe, 0x55, 0xfe, 0xff, 0xff, 0xff, /* full set */ }, }; @@ -1004,11 +1004,16 @@ static void board_init(void) /* Disable scanning KSO13 & 14 if keypad isn't present. */ if (!(sku & SKU_ID_MASK_KEYPAD)) { keyboard_raw_set_cols(KEYBOARD_COLS_NO_KEYPAD); - keyscan_config.actual_key_mask[0] = 0x14; - keyscan_config.actual_key_mask[1] = 0xff; keyscan_config.actual_key_mask[11] = 0xfa; keyscan_config.actual_key_mask[12] = 0xca; } + if (oem == PROJECT_AKALI && model == MODEL_BARD) { + /* Search key is moved to col=0,row=3 */ + keyscan_config.actual_key_mask[0] = 0x1c; + keyscan_config.actual_key_mask[1] = 0xfe; + /* No need to swap scancode_set2[0][3] and [1][0] because both + * are mapped to search key. */ + } if (sku & SKU_ID_MASK_UK2) /* * Observed on Shyvana with UK keyboard, |