diff options
| author | Aseda Aboagye <aaboagye@google.com> | 2017-11-15 22:23:00 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-11-17 20:18:38 -0800 |
| commit | 34a97f50d5275f1fa2f1cb377683c96286b2421d (patch) | |
| tree | 2ea62dc537426fb252123fb93b3b4f05db5f1443 /common/keyboard_mkbp.c | |
| parent | f587852570770564e8a94b2c3f7ad7d97883c49a (diff) | |
| download | chrome-ec-34a97f50d5275f1fa2f1cb377683c96286b2421d.tar.gz | |
buttons: Make buttons[] common.
Nearly every board had a buttons array defined in which its contents had
the standard volume buttons. This commit creates a single common
buttons array that can contain the standard volume buttons and recovery
buttons. If a board has volume up and down buttons, they can simply
define CONFIG_VOLUME_BUTTONS and it will populate the buttons array with
the standard definition. The buttons are active low and have a 30 ms
debounce period. Similiarly, if a board has a dedicated recovery
button, defining CONFIG_DEDICATED_RECOVERY_BUTTON will also populate the
buttons array with a recovery button.
BUG=chromium:783371
BRANCH=None
TEST=make -j buildall.
TEST=Flash a device with CONFIG_VOLUME_BUTTONS, verify pressing volume
buttons still work.
Change-Id: Ie5d63670ca4c6b146ec8ffb64d40ea9ce437b913
Signed-off-by: Aseda Aboagye <aaboagye@google.com>
Reviewed-on: https://chromium-review.googlesource.com/773794
Commit-Ready: Aseda Aboagye <aaboagye@chromium.org>
Tested-by: Aseda Aboagye <aaboagye@chromium.org>
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-by: Shawn N <shawnn@chromium.org>
Diffstat (limited to 'common/keyboard_mkbp.c')
| -rw-r--r-- | common/keyboard_mkbp.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/common/keyboard_mkbp.c b/common/keyboard_mkbp.c index df2ae73045..2e1806abec 100644 --- a/common/keyboard_mkbp.c +++ b/common/keyboard_mkbp.c @@ -399,19 +399,19 @@ void clear_typematic_key(void) static uint32_t get_supported_buttons(void) { uint32_t val = 0; -#ifdef CONFIG_BUTTON_COUNT - int i; - for (i = 0; i < CONFIG_BUTTON_COUNT; i++) { - if (buttons[i].type == KEYBOARD_BUTTON_VOLUME_UP) - val |= (1 << EC_MKBP_VOL_UP); - if (buttons[i].type == KEYBOARD_BUTTON_VOLUME_DOWN) - val |= (1 << EC_MKBP_VOL_DOWN); - } -#endif +#ifdef CONFIG_VOLUME_BUTTONS + val |= (1 << EC_MKBP_VOL_UP) | (1 << EC_MKBP_VOL_DOWN); +#endif /* defined(CONFIG_VOLUME_BUTTONS) */ + +#ifdef CONFIG_DEDICATED_RECOVERY_BUTTON + val |= (1 << EC_MKBP_RECOVERY); +#endif /* defined(CONFIG_DEDICATED_RECOVERY_BUTTON) */ + #ifdef CONFIG_POWER_BUTTON val |= (1 << EC_MKBP_POWER_BUTTON); -#endif +#endif /* defined(CONFIG_POWER_BUTTON) */ + return val; } |