diff options
| author | Rajat Jain <rajatja@google.com> | 2020-04-03 00:58:13 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-04-21 21:32:50 +0000 |
| commit | d4105005da492f8e20619cad88fdb15d6dee098f (patch) | |
| tree | 44a9dc663c5d0e403ce254ff7d733631e3581b40 /common/keyboard_8042.c | |
| parent | d2b73ad856c4ba697a2dfd8c4bf4263ffc18a5ce (diff) | |
| download | chrome-ec-d4105005da492f8e20619cad88fdb15d6dee098f.tar.gz | |
common: Make scancode table always mutable
Since the vivaldi requires the scancode to be mutable, and vivaldi
shall be enabled by default for all boards, thus make the scancode
table to be always mutable and get rid of the config option it hides
behind.
BUG=b:146501925
TEST=Build
BRANCH=firmware-hatch-12672.B
Signed-off-by: Rajat Jain <rajatja@google.com>
Change-Id: Iaedcd6d84caf31c91a61854f96414bcea38f5c2a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2133825
Reviewed-by: Jett Rink <jettrink@chromium.org>
Diffstat (limited to 'common/keyboard_8042.c')
| -rw-r--r-- | common/keyboard_8042.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/keyboard_8042.c b/common/keyboard_8042.c index 7063ead88f..7c1249e748 100644 --- a/common/keyboard_8042.c +++ b/common/keyboard_8042.c @@ -345,7 +345,7 @@ static enum ec_error_list matrix_callback(int8_t row, int8_t col, if (row >= KEYBOARD_ROWS || col >= keyboard_cols) return EC_ERROR_INVAL; - make_code = scancode_set2[col][row]; + make_code = get_scancode_set2(row, col); #ifdef CONFIG_KEYBOARD_SCANCODE_CALLBACK { @@ -423,11 +423,11 @@ void keyboard_state_changed(int row, int col, int is_pressed) enum ec_error_list ret; #ifdef CONFIG_KEYBOARD_DEBUG - char mylabel = keycap_label[col][row]; + char mylabel = get_keycap_label(row, col); if (mylabel & KEYCAP_LONG_LABEL_BIT) CPRINTS("KB (%d,%d)=%d %s", row, col, is_pressed, - keycap_long_label[mylabel & KEYCAP_LONG_LABEL_INDEX_BITMASK]); + get_keycap_long_label(mylabel & KEYCAP_LONG_LABEL_INDEX_BITMASK)); else CPRINTS("KB (%d,%d)=%d %c", row, col, is_pressed, mylabel); #endif |