diff options
| author | Julius Werner <jwerner@chromium.org> | 2018-01-31 17:23:22 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-02-07 15:04:20 -0800 |
| commit | b2846490c3d027a434d34bffd490bf07b0d38eec (patch) | |
| tree | 9344bc880c3ea17434fe1a81e36e1bb39a2be446 | |
| parent | 2fbb522949cd5c7a4f203a90da1bcdbf6057b5ae (diff) | |
| download | vboot-b2846490c3d027a434d34bffd490bf07b0d38eec.tar.gz | |
vboot_api: Remove unused VB_SCREEN constants
Some of the defined screens have never been used or we've stopped using
them a while ago. Remove the respective constants to make it clearer
that callers of the library are not expected to handle them.
CQ-DEPEND=CL:903362
BRANCH=None
BUG=None
TEST=make runtests
Change-Id: I82308fc76dc10b2c8b408af7a15a819120043632
Signed-off-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/902899
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
| -rw-r--r-- | firmware/include/vboot_api.h | 9 | ||||
| -rw-r--r-- | tests/vboot_api_devmode_tests.c | 6 |
2 files changed, 3 insertions, 12 deletions
diff --git a/firmware/include/vboot_api.h b/firmware/include/vboot_api.h index 84555ffb..994f00b4 100644 --- a/firmware/include/vboot_api.h +++ b/firmware/include/vboot_api.h @@ -737,10 +737,8 @@ enum VbScreenType_t { VB_SCREEN_BLANK = 0, /* Developer - warning */ VB_SCREEN_DEVELOPER_WARNING = 0x101, - /* Developer - easter egg */ - VB_SCREEN_DEVELOPER_EGG = 0x102, - /* Recovery - remove inserted devices */ - VB_SCREEN_RECOVERY_REMOVE = 0x201, + /* REMOVED: Developer - easter egg (0x102) */ + /* REMOVED: Recovery - remove inserted devices (0x201) */ /* Recovery - insert recovery image */ VB_SCREEN_RECOVERY_INSERT = 0x202, /* Recovery - inserted image invalid */ @@ -755,8 +753,7 @@ enum VbScreenType_t { VB_SCREEN_TO_NORM_CONFIRMED = 0x207, /* Broken screen shown after verification failure */ VB_SCREEN_OS_BROKEN = 0x208, - /* Display base screen (no icons, no text) */ - VB_SCREEN_BASE = 0x209, + /* REMOVED: Display base screen (no icons, no text) (0x209) */ /* Detachable Menu - Developer Warning */ VB_SCREEN_DEVELOPER_WARNING_MENU = 0x20a, /* Detachable Menu - Developer Boot */ diff --git a/tests/vboot_api_devmode_tests.c b/tests/vboot_api_devmode_tests.c index 9e99fc6a..7e67e07d 100644 --- a/tests/vboot_api_devmode_tests.c +++ b/tests/vboot_api_devmode_tests.c @@ -244,12 +244,6 @@ VbError_t VbExDisplayScreen(uint32_t screen_type, uint32_t locale) case VB_SCREEN_DEVELOPER_WARNING: VB2_DEBUG("VbExDisplayScreen(DEV)\n"); break; - case VB_SCREEN_DEVELOPER_EGG: - VB2_DEBUG("VbExDisplayScreen(EGG)\n"); - break; - case VB_SCREEN_RECOVERY_REMOVE: - VB2_DEBUG("VbExDisplayScreen(REMOVE)\n"); - break; case VB_SCREEN_RECOVERY_INSERT: VB2_DEBUG("VbExDisplayScreen(INSERT)\n"); break; |