diff options
| author | Daisuke Nojiri <dnojiri@chromium.org> | 2018-10-16 15:16:29 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-10-19 23:21:56 -0700 |
| commit | 9a890ad22965daa7e9365a0b2cb8c734ae41a842 (patch) | |
| tree | 27e3f1f0845031e685fc46ffdad44d8cb87adfeb /include/keyboard_8042_sharedlib.h | |
| parent | 4d4d8f06e91090336c2eb29ee00ca86fea2bb796 (diff) | |
| download | chrome-ec-9a890ad22965daa7e9365a0b2cb8c734ae41a842.tar.gz | |
Keyboard: Allow keyboard size to be set at run time
Currently, the keyboard size (i.e. number of columns) is static.
This patch allows it to be configured at run time. It's required to
support a keyboard with/without keypad in a single image.
KEYBOARD_COLS_MAX has the build time col size. It's used to allocate
exact spaces for arrays. Actual keyboard scanning is done using
keyboard_cols, which holds a runtime col size.
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
BUG=b:117126568
BRANCH=none
TEST=Verify keyboard functionality on Sona and Veyron.
Change-Id: I4b3552be0b4b315c3fe5a6884cf25e10aba8be7c
Reviewed-on: https://chromium-review.googlesource.com/1285292
Commit-Ready: Daisuke Nojiri <dnojiri@chromium.org>
Tested-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'include/keyboard_8042_sharedlib.h')
| -rw-r--r-- | include/keyboard_8042_sharedlib.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/keyboard_8042_sharedlib.h b/include/keyboard_8042_sharedlib.h index 1cff2544dc..a70312f3d8 100644 --- a/include/keyboard_8042_sharedlib.h +++ b/include/keyboard_8042_sharedlib.h @@ -19,9 +19,9 @@ struct button_8042_t { /* The standard Chrome OS keyboard matrix table. */ #ifdef CONFIG_KEYBOARD_SCANCODE_MUTABLE -extern uint16_t scancode_set2[KEYBOARD_COLS][KEYBOARD_ROWS]; +extern uint16_t scancode_set2[KEYBOARD_COLS_MAX][KEYBOARD_ROWS]; #else -extern const uint16_t scancode_set2[KEYBOARD_COLS][KEYBOARD_ROWS]; +extern const uint16_t scancode_set2[KEYBOARD_COLS_MAX][KEYBOARD_ROWS]; #endif /* Translation from scan code set 2 to set 1. */ @@ -70,9 +70,9 @@ enum keycap_long_label_idx { extern const char * const keycap_long_label[]; #ifdef CONFIG_KEYBOARD_SCANCODE_MUTABLE -extern char keycap_label[KEYBOARD_COLS][KEYBOARD_ROWS]; +extern char keycap_label[KEYBOARD_COLS_MAX][KEYBOARD_ROWS]; #else -extern const char keycap_label[KEYBOARD_COLS][KEYBOARD_ROWS]; +extern const char keycap_label[KEYBOARD_COLS_MAX][KEYBOARD_ROWS]; #endif #endif |