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 /board/eve | |
| 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 'board/eve')
| -rw-r--r-- | board/eve/board.c | 6 | ||||
| -rw-r--r-- | board/eve/board.h | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/board/eve/board.c b/board/eve/board.c index 8d1b21ccd6..ef5699e2df 100644 --- a/board/eve/board.c +++ b/board/eve/board.c @@ -494,13 +494,13 @@ static void board_init(void) /* Update AC status to the PCH */ board_update_ac_status(); -#if defined(CONFIG_KEYBOARD_SCANCODE_MUTABLE) && !defined(TEST_BUILD) +#ifndef TEST_BUILD if (board_get_version() == 4) { /* Set F13 to new defined key on EVT */ CPRINTS("Overriding F13 scan code"); - scancode_set2[9][3] = 0xe007; + set_scancode_set2(3, 9, 0xe007); #ifdef CONFIG_KEYBOARD_DEBUG - keycap_label[9][3] = KLLI_F13; + set_keycap_label(3, 9, KLLI_F13); #endif } #endif diff --git a/board/eve/board.h b/board/eve/board.h index 1df410d6ef..8a46d74156 100644 --- a/board/eve/board.h +++ b/board/eve/board.h @@ -73,7 +73,6 @@ #define CONFIG_KEYBOARD_COL2_INVERTED #define CONFIG_KEYBOARD_PROTOCOL_8042 #define CONFIG_KEYBOARD_REFRESH_ROW3 -#define CONFIG_KEYBOARD_SCANCODE_MUTABLE #define CONFIG_TABLET_MODE /* Battery */ |