diff options
| author | Ben Chen <ben.chen2@quanta.corp-partner.google.com> | 2021-07-02 14:49:13 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-07-08 02:23:54 +0000 |
| commit | 37cfe3b4d56da9661de0cb96273e692599e1d009 (patch) | |
| tree | ad2df8ffba1f4d476955f8beffb72da07b88c735 /board/magolor/board.c | |
| parent | f04dc5058b6dad98f8531c24afd311256f344a8d (diff) | |
| download | chrome-ec-37cfe3b4d56da9661de0cb96273e692599e1d009.tar.gz | |
magma: support vivaldi_keyboard with num_pad
config num_pad vialdikeyboard by board version
or GPIO_EC_VIVALDIKEYBOARD_ID status
BUG=b:192585368
BRANCH=dedede
TEST=verify keycode is correct in `evtest`
Change-Id: I6f592a7ff5b62e241202b347be40633a324c78a6
Signed-off-by: Ben Chen <ben.chen2@quanta.corp-partner.google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3002720
Reviewed-by: Henry Sun <henrysun@google.com>
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Diffstat (limited to 'board/magolor/board.c')
| -rw-r--r-- | board/magolor/board.c | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/board/magolor/board.c b/board/magolor/board.c index d209de4497..08ae6f1a04 100644 --- a/board/magolor/board.c +++ b/board/magolor/board.c @@ -147,6 +147,23 @@ static const struct ec_response_keybd_config magpie_keybd = { .capabilities = KEYBD_CAP_SCRNLOCK_KEY | KEYBD_CAP_NUMERIC_KEYPAD, }; +static const struct ec_response_keybd_config magma_keybd = { + .num_top_row_keys = 10, + .action_keys = { + TK_BACK, /* T1 */ + TK_REFRESH, /* T2 */ + TK_FULLSCREEN, /* T3 */ + TK_OVERVIEW, /* T4 */ + TK_SNAPSHOT, /* T5 */ + TK_BRIGHTNESS_DOWN, /* T6 */ + TK_BRIGHTNESS_UP, /* T7 */ + TK_VOL_MUTE, /* T8 */ + TK_VOL_DOWN, /* T9 */ + TK_VOL_UP, /* T10 */ + }, + .capabilities = KEYBD_CAP_SCRNLOCK_KEY | KEYBD_CAP_NUMERIC_KEYPAD, +}; + __override uint8_t board_keyboard_row_refresh(void) { @@ -159,8 +176,13 @@ uint8_t board_keyboard_row_refresh(void) __override const struct ec_response_keybd_config *board_vivaldi_keybd_config(void) { - if (get_cbi_fw_config_numeric_pad()) - return &magpie_keybd; + if (get_cbi_fw_config_numeric_pad()) { + if (system_get_board_version() >= 6 || + gpio_get_level(GPIO_EC_VIVALDIKEYBOARD_ID)) + return &magma_keybd; + else + return &magpie_keybd; + } else { if (system_get_board_version() >= 5) return &magister_keybd; |