summaryrefslogtreecommitdiff
path: root/include/keyboard_config.h
diff options
context:
space:
mode:
authorDaisuke Nojiri <dnojiri@chromium.org>2018-10-10 11:47:39 -0700
committerchrome-bot <chrome-bot@chromium.org>2018-10-23 13:01:57 -0700
commit75f7dca3c3d03527e23e9414d0dff85d63c6ea26 (patch)
tree0fee18db6dc60c00555a756bfafd513910b351cb /include/keyboard_config.h
parent8b51318ae8eeb10c494f007969b1e1e3548e616f (diff)
downloadchrome-ec-75f7dca3c3d03527e23e9414d0dff85d63c6ea26.tar.gz
Keyboard: Add keypad support
This patch adds keypad support. Keypad layout is: page_up page_dwn home end delete / * - 7 8 9 + 4 5 6 1 2 3 enter 0 . Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org> BUG=b:117126568 BRANCH=none TEST=buildall Change-Id: Ic53eda12f7348ff09494aa8d2c2f45080e17bae7 Reviewed-on: https://chromium-review.googlesource.com/1285293 Commit-Ready: Daisuke Nojiri <dnojiri@chromium.org> Tested-by: Daisuke Nojiri <dnojiri@chromium.org> Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'include/keyboard_config.h')
-rw-r--r--include/keyboard_config.h11
1 files changed, 9 insertions, 2 deletions
diff --git a/include/keyboard_config.h b/include/keyboard_config.h
index 81174eb850..2d6398c548 100644
--- a/include/keyboard_config.h
+++ b/include/keyboard_config.h
@@ -15,13 +15,20 @@
#define KEYBOARD_IDS 2
#endif
-/* Keyboard matrix is 13 output columns x 8 input rows */
+/* Keyboard matrix is 13 (or 15 with keypad) output columns x 8 input rows */
+#define KEYBOARD_COLS_WITH_KEYPAD 15
+#define KEYBOARD_COLS_NO_KEYPAD 13
+
/*
* KEYBOARD_COLS_MAX has the build time column size. It's used to allocate
* exact spaces for arrays. Actual keyboard scanning is done using
* keyboard_cols, which holds a runtime column size.
*/
-#define KEYBOARD_COLS_MAX 13
+#ifdef CONFIG_KEYBOARD_KEYPAD
+#define KEYBOARD_COLS_MAX KEYBOARD_COLS_WITH_KEYPAD
+#else
+#define KEYBOARD_COLS_MAX KEYBOARD_COLS_NO_KEYPAD
+#endif
#define KEYBOARD_ROWS 8
extern uint8_t keyboard_cols;