diff options
| author | Shelley Chen <shchen@chromium.org> | 2017-11-14 12:35:55 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-01-25 19:23:44 -0800 |
| commit | e6e177d5122af78e5aa664050d67318495aa163b (patch) | |
| tree | e6c68561f45f85290205b9718ca020c45418e480 /firmware/lib/include | |
| parent | 5f9b770d7a44e6011ebe1ec7b28692e4eab1c2b6 (diff) | |
| download | vboot-e6e177d5122af78e5aa664050d67318495aa163b.tar.gz | |
detachables: Replace RECOVERY with OPTIONS menu
This patch implements the new OPTIONS menu which will function in stead
of the old basic RECOVERY menu. The TO_DEV menu is now directly
reachable through the VolUp+VolDown key combo. Cancelling any menu or
changing USB state will immediately drop back to the menuless base
screens (INSERT or NOGOOD).
Also contains some minor clean-up here and there, like decoupling code
from tests a bit more by reducing reliance on global initializers. Code
for the now obsolete RECOVERY menu will be removed in a follow-up patch.
BUG=b:67371896, b:64400036
BRANCH=None
TEST=Go through all recovery screens, trry various back-and-forth
transitions between OPTIONS, LANGUAGE and TO_DEV, in addition to
inserting/removing USB at various times.
CQ-DEPEND=CL:884840
Change-Id: I95319778e14ce07fe2ada3edf95990560ac7081a
Signed-off-by: Shelley Chen <shchen@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/770258
Commit-Ready: Julius Werner <jwerner@chromium.org>
Tested-by: Julius Werner <jwerner@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@chromium.org>
Diffstat (limited to 'firmware/lib/include')
| -rw-r--r-- | firmware/lib/include/vboot_ui_menu_private.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/firmware/lib/include/vboot_ui_menu_private.h b/firmware/lib/include/vboot_ui_menu_private.h index f451a531..c3007497 100644 --- a/firmware/lib/include/vboot_ui_menu_private.h +++ b/firmware/lib/include/vboot_ui_menu_private.h @@ -76,15 +76,11 @@ typedef enum _VB_LANGUAGES_MENU { } VB_LANGUAGES_MENU; typedef enum _VB_OPTIONS_MENU { - VB_OPTIONS_CANCEL, VB_OPTIONS_DBG_INFO, + VB_OPTIONS_CANCEL, VB_OPTIONS_POWER_OFF, VB_OPTIONS_LANGUAGE, VB_OPTIONS_COUNT, } VB_OPTIONS_MENU; -extern VB_MENU current_menu; -extern VB_MENU prev_menu; -extern int current_menu_idx; - #endif |