Add a constant for the escape key
We use this in a few places, so add a constant.
BUG=chromium:837018
BRANCH=none
TEST=FEATURES=test emerge-grunt --nodeps vboot_reference
Change-Id: I7182d0ac52c23c01397de08683ad83b818486f91
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1286221
Reviewed-by: Randall Spangler <rspangler@chromium.org>
diff --git a/firmware/include/vboot_api.h b/firmware/include/vboot_api.h
index abc8213..9d0ec3f 100644
--- a/firmware/include/vboot_api.h
+++ b/firmware/include/vboot_api.h
@@ -715,11 +715,12 @@
/* Key codes for required non-printable-ASCII characters. */
enum VbKeyCode_t {
+ VB_KEY_ESC = 0x1b,
VB_KEY_UP = 0x100,
VB_KEY_DOWN = 0x101,
VB_KEY_LEFT = 0x102,
VB_KEY_RIGHT = 0x103,
- VB_KEY_CTRL_ENTER = 0x104
+ VB_KEY_CTRL_ENTER = 0x104,
};
/*
@@ -756,7 +757,7 @@
* 0x09 Tab
* 0x0D Enter (carriage return)
* 0x01 - 0x1A Ctrl+A - Ctrl+Z (yes, those alias with backspace/tab/enter)
- * 0x1B Esc
+ * 0x1B Esc (VB_KEY_ESC)
* 0x20 Space
* 0x30 - 0x39 '0' - '9'
* 0x60 - 0x7A 'a' - 'z'
diff --git a/firmware/lib/vboot_ui.c b/firmware/lib/vboot_ui.c
index 0f1f7cc..e2ee0a6 100644
--- a/firmware/lib/vboot_ui.c
+++ b/firmware/lib/vboot_ui.c
@@ -167,7 +167,7 @@
if (confirm_flags & VB_CONFIRM_SPACE_MEANS_NO)
return 0;
break;
- case 0x1b:
+ case VB_KEY_ESC:
VB2_DEBUG("No (0)\n");
return 0;
break;
diff --git a/tests/vboot_api_kernel2_tests.c b/tests/vboot_api_kernel2_tests.c
index 3bc3a7f..2f76490 100644
--- a/tests/vboot_api_kernel2_tests.c
+++ b/tests/vboot_api_kernel2_tests.c
@@ -226,7 +226,7 @@
TEST_EQ(VbUserConfirms(&ctx, 0), 1, "Enter");
ResetMocks();
- mock_keypress[0] = 0x1b;
+ mock_keypress[0] = VB_KEY_ESC;
TEST_EQ(VbUserConfirms(&ctx, 0), 0, "Esc");
ResetMocks();
@@ -407,7 +407,7 @@
shared->flags = VBSD_HONOR_VIRT_DEV_SWITCH | VBSD_BOOT_DEV_SWITCH_ON;
mock_keypress[0] = ' ';
mock_keypress[1] = ' ';
- mock_keypress[2] = 0x1b;
+ mock_keypress[2] = VB_KEY_ESC;
TEST_EQ(VbBootDeveloper(&ctx), 1002, "Space-space");
TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING,
" warning screen");
