summaryrefslogtreecommitdiff
path: root/common/main.c
diff options
context:
space:
mode:
authorNicolas Boichat <drinkcat@google.com>2017-01-14 17:33:02 +0800
committerchrome-bot <chrome-bot@chromium.org>2017-01-20 00:05:06 -0800
commit90ae18655c01e880563add1c761193316a633034 (patch)
tree9860d1d35c8122406291eec6e479adb5be5bbb63 /common/main.c
parenta1064d997902b567303e1eb6be5780baa4c0d4ae (diff)
downloadchrome-ec-90ae18655c01e880563add1c761193316a633034.tar.gz
button: Check volume up/down status and set recovery mode
Add support for entering recovery mode using volume up/down keys. BRANCH=none BUG=chrome-os-partner:61930 TEST=Press Power+Volume Up+Volume Down, poppy enters recovery Change-Id: Id40a144e9b430cfb9dfd47048e9e96d598bc3db8 Reviewed-on: https://chromium-review.googlesource.com/428530 Commit-Ready: Nicolas Boichat <drinkcat@chromium.org> Tested-by: Nicolas Boichat <drinkcat@chromium.org> Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'common/main.c')
-rw-r--r--common/main.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/common/main.c b/common/main.c
index 513832f04f..a5f6e6a3b1 100644
--- a/common/main.c
+++ b/common/main.c
@@ -6,6 +6,7 @@
*/
#include "board_config.h"
+#include "button.h"
#include "clock.h"
#include "common.h"
#include "console.h"
@@ -157,6 +158,9 @@ test_mockable __keep int main(void)
#ifdef HAS_TASK_KEYSCAN
keyboard_scan_init();
#endif
+#ifdef CONFIG_BUTTON_COUNT
+ button_init();
+#endif
#ifdef CONFIG_RWSIG
/*