summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShelley Chen <shchen@chromium.org>2017-01-06 09:03:30 -0800
committerchrome-bot <chrome-bot@chromium.org>2017-01-24 01:31:04 -0800
commit4de0c43b1c72cceca820edafe13d9b64cc456214 (patch)
tree9ba1b45e50d9856f1cfca70cf38f979311d313da
parenta609478d1a1e9bc11a2122797ed4eb336d5dbdee (diff)
downloadvboot-4de0c43b1c72cceca820edafe13d9b64cc456214.tar.gz
firmware: Adding vol up/down ascii definitions
BUG=chrome-os-partner:61275 BRANCH=None TEST=test vol up/down keys and see if menu changes. Change-Id: I2213639d530f954f12040b14bf2e5cdeb5c03218 Signed-off-by: Shelley Chen <shchen@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/426408 Reviewed-by: Randall Spangler <rspangler@chromium.org>
-rw-r--r--firmware/include/vboot_api.h7
-rw-r--r--firmware/lib/vboot_ui_menu.c4
2 files changed, 10 insertions, 1 deletions
diff --git a/firmware/include/vboot_api.h b/firmware/include/vboot_api.h
index d57f98d0..0dec8ef0 100644
--- a/firmware/include/vboot_api.h
+++ b/firmware/include/vboot_api.h
@@ -824,7 +824,12 @@ enum VbKeyCode_t {
VB_KEY_DOWN = 0x101,
VB_KEY_LEFT = 0x102,
VB_KEY_RIGHT = 0x103,
- VB_KEY_CTRL_ENTER = 0x104,
+ VB_KEY_CTRL_ENTER = 0x104
+};
+
+enum VbButtonCode_t {
+ VB_BUTTON_VOL_UP = 0x62,
+ VB_BUTTON_VOL_DOWN = 0x63
};
/* Flags for additional information.
diff --git a/firmware/lib/vboot_ui_menu.c b/firmware/lib/vboot_ui_menu.c
index 1256e2ed..4c0eab1c 100644
--- a/firmware/lib/vboot_ui_menu.c
+++ b/firmware/lib/vboot_ui_menu.c
@@ -632,6 +632,7 @@ VbError_t vb2_developer_menu(struct vb2_context *ctx, VbCommonParams *cparams)
/* Only disable virtual dev switch if allowed by GBB */
if (!(gbb->flags & GBB_FLAG_ENTER_TRIGGERS_TONORM))
break;
+ case VB_BUTTON_VOL_UP:
case VB_KEY_UP:
vb2_get_current_menu_size(current_menu,
NULL, &menu_size);
@@ -639,6 +640,7 @@ VbError_t vb2_developer_menu(struct vb2_context *ctx, VbCommonParams *cparams)
menu_size;
vb2_print_current_menu();
break;
+ case VB_BUTTON_VOL_DOWN:
case VB_KEY_DOWN:
vb2_get_current_menu_size(current_menu,
NULL, &menu_size);
@@ -880,12 +882,14 @@ VbError_t vb2_recovery_menu(struct vb2_context *ctx, VbCommonParams *cparams)
case 0:
/* nothing pressed */
break;
+ case VB_BUTTON_VOL_UP:
case VB_KEY_UP:
VB2_DEBUG("VbBootRecoveryMenu() - pressed key VB_KEY_UP\n");
vb2_get_current_menu_size(current_menu, NULL, &menu_size);
current_menu_idx = (current_menu_idx+menu_size-1) % menu_size;
vb2_print_current_menu();
break;
+ case VB_BUTTON_VOL_DOWN:
case VB_KEY_DOWN:
VB2_DEBUG("VbBootRecoveryMenu() - pressed key VB_KEY_DOWN\n");
vb2_get_current_menu_size(current_menu, NULL, &menu_size);