diff options
| author | Randall Spangler <rspangler@chromium.org> | 2012-06-04 12:50:43 -0700 |
|---|---|---|
| committer | Gerrit <chrome-bot@google.com> | 2012-06-04 17:07:15 -0700 |
| commit | 4568bc7dbdd51c062d8c3adfa38ff6f070f88a40 (patch) | |
| tree | 061801d95ce8f06935f933dcb58d0e739370f83d /include/keyboard_scan.h | |
| parent | 5edb0c5d979a01b47571e29686b7f26d50b613ea (diff) | |
| download | chrome-ec-4568bc7dbdd51c062d8c3adfa38ff6f070f88a40.tar.gz | |
Release keyboard recovery button on next power-on
Keyboard recovery used to persist until the next time the EC was
reset. It should release the next time the user turns on the system
via the lid or power button.
Signed-off-by: Randall Spangler <rspangler@chromium.org>
BUG=chrome-os-partner:10034
TEST=manual
1. power system on normally. not in recovery.
2. press Power+Esc+Refresh. System turns on into recovery.
3. shut system down
4. power system on with lid-open. System boots normally.
5. repeat steps 2-3, then power system on with power button. System boots normally.
Change-Id: I455c7191d128614629c50ba27d7ef977e414fe90
Reviewed-on: https://gerrit.chromium.org/gerrit/24409
Commit-Ready: Randall Spangler <rspangler@chromium.org>
Tested-by: Randall Spangler <rspangler@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include/keyboard_scan.h')
| -rw-r--r-- | include/keyboard_scan.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/keyboard_scan.h b/include/keyboard_scan.h index 67e09e0312..590f482317 100644 --- a/include/keyboard_scan.h +++ b/include/keyboard_scan.h @@ -13,15 +13,14 @@ /* Initializes the module. */ int keyboard_scan_init(void); -/* Returns non-zero if recovery key was pressed at boot. */ +/* Returns non-zero if recovery key was pressed at boot. Used by st32m-based + * boards only; lm4-based boards use power_recovery_pressed(). */ int keyboard_scan_recovery_pressed(void); /* clear any saved keyboard state (empty FIFO, etc) */ void keyboard_clear_state(void); - /* Enables/disables keyboard matrix scan. */ void keyboard_enable_scanning(int enable); - -#endif /* __CROS_KEYBOARD_SCAN_H */ +#endif /* __CROS_EC_KEYBOARD_SCAN_H */ |