diff options
author | Hsuan Ting Chen <roccochen@chromium.org> | 2020-01-21 14:40:15 +0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-02-12 11:46:20 +0000 |
commit | f15845a77700a03ee89fa064b796d95ff5fa5406 (patch) | |
tree | 645e1eacd40949811df1c23e95c6a250beddb807 | |
parent | a3bfabdc4e4cd1c20625c8407fb1511ff4ca2eff (diff) | |
download | vboot-f15845a77700a03ee89fa064b796d95ff5fa5406.tar.gz |
vboot: Rename legacy UIs
According to crbug.com/1033815, rename files and entry point functions
for two legacy UIs. Ideally, these UIs will be deprecated after the
detachable UI revamp (b:146399181) is done.
common:
- rename vboot_ui_common.{c,h} to vboot_ui_legacy_common.{c,h}
LEGACY_CLAMSHELL_UI:
- rename vboot_ui.c to vboot_ui_legacy_clamshell.c
- rename vboot_ui_wilco.c to vboot_ui_legacy_wilco.c
- rename VbBootRecovery() to VbBootRecoveryLegacyClamshell()
- rename VbBootDiagnostic() to VbBootDiagnosticLegacyClamshell()
- rename VbBootDeveloper() to VbBootDeveloperLegacyClamshell()
LEGACY_MENU_UI:
- rename vboot_ui_menu.c to vboot_ui_legacy_menu.c
- rename vboot_ui_menu_private.h to vboot_ui_legacy_menu_private.h
- rename VbBootRecoveryMenu() to VbBootRecoveryLegacyMenu()
- rename VbBootDeveloperMenu() to VbBootDeveloperLegacyMenu()
BRANCH=none
BUG=b:146399181,chromium:1033815
TEST=USE="legacy_clamshell_ui" emerge-nami vboot_reference
TEST=USE="legacy_menu_ui" emerge-nami vboot_reference
Change-Id: I70dafbab0070b19ed963d2a4ba63a95f4a0f3224
Signed-off-by: Hsuan Ting Chen <roccochen@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2008980
Reviewed-by: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-by: Joel Kitching <kitching@chromium.org>
-rw-r--r-- | Makefile | 20 | ||||
-rw-r--r-- | firmware/lib/include/vboot_kernel.h | 20 | ||||
-rw-r--r-- | firmware/lib/include/vboot_ui_legacy_common.h (renamed from firmware/lib/include/vboot_ui_common.h) | 2 | ||||
-rw-r--r-- | firmware/lib/include/vboot_ui_legacy_menu_private.h (renamed from firmware/lib/include/vboot_ui_menu_private.h) | 9 | ||||
-rw-r--r-- | firmware/lib/include/vboot_ui_legacy_wilco.h (renamed from firmware/lib/include/vboot_ui_wilco.h) | 0 | ||||
-rw-r--r-- | firmware/lib/vboot_api_kernel.c | 10 | ||||
-rw-r--r-- | firmware/lib/vboot_ui_legacy_clamshell.c (renamed from firmware/lib/vboot_ui.c) | 62 | ||||
-rw-r--r-- | firmware/lib/vboot_ui_legacy_common.c (renamed from firmware/lib/vboot_ui_common.c) | 2 | ||||
-rw-r--r-- | firmware/lib/vboot_ui_legacy_menu.c (renamed from firmware/lib/vboot_ui_menu.c) | 14 | ||||
-rw-r--r-- | firmware/lib/vboot_ui_legacy_wilco.c (renamed from firmware/lib/vboot_ui_wilco.c) | 4 | ||||
-rw-r--r-- | tests/vboot_api_kernel4_tests.c | 6 | ||||
-rw-r--r-- | tests/vboot_legacy_clamshell_beep_tests.c (renamed from tests/vboot_api_devmode_tests.c) | 2 | ||||
-rw-r--r-- | tests/vboot_legacy_clamshell_tests.c (renamed from tests/vboot_api_kernel2_tests.c) | 197 | ||||
-rw-r--r-- | tests/vboot_legacy_menu_tests.c (renamed from tests/vboot_detach_menu_tests.c) | 169 |
14 files changed, 270 insertions, 247 deletions
@@ -377,10 +377,10 @@ FWLIB_SRCS = \ firmware/lib/vboot_audio.c \ firmware/lib/vboot_display.c \ firmware/lib/vboot_kernel.c \ - firmware/lib/vboot_ui.c \ - firmware/lib/vboot_ui_common.c \ - firmware/lib/vboot_ui_menu.c \ - firmware/lib/vboot_ui_wilco.c \ + firmware/lib/vboot_ui_legacy_clamshell.c \ + firmware/lib/vboot_ui_legacy_common.c \ + firmware/lib/vboot_ui_legacy_menu.c \ + firmware/lib/vboot_ui_legacy_wilco.c \ firmware/lib20/api_kernel.c \ firmware/lib20/kernel.c \ firmware/lib20/misc.c \ @@ -663,13 +663,13 @@ TEST_NAMES = \ tests/sha_benchmark \ tests/subprocess_tests \ tests/utility_string_tests \ - tests/vboot_api_devmode_tests \ - tests/vboot_api_kernel2_tests \ tests/vboot_api_kernel4_tests \ tests/vboot_api_kernel_tests \ - tests/vboot_detach_menu_tests \ tests/vboot_display_tests \ tests/vboot_kernel_tests \ + tests/vboot_legacy_clamshell_beep_tests \ + tests/vboot_legacy_clamshell_tests \ + tests/vboot_legacy_menu_tests \ tests/verify_kernel ifeq (${MOCK_TPM}${TPM2_MODE},) @@ -1186,13 +1186,13 @@ ifeq (${MOCK_TPM}${TPM2_MODE},) ${RUNTEST} ${BUILD_RUN}/tests/tlcl_tests endif ${RUNTEST} ${BUILD_RUN}/tests/utility_string_tests - ${RUNTEST} ${BUILD_RUN}/tests/vboot_api_devmode_tests - ${RUNTEST} ${BUILD_RUN}/tests/vboot_api_kernel2_tests ${RUNTEST} ${BUILD_RUN}/tests/vboot_api_kernel4_tests ${RUNTEST} ${BUILD_RUN}/tests/vboot_api_kernel_tests - ${RUNTEST} ${BUILD_RUN}/tests/vboot_detach_menu_tests ${RUNTEST} ${BUILD_RUN}/tests/vboot_display_tests ${RUNTEST} ${BUILD_RUN}/tests/vboot_kernel_tests + ${RUNTEST} ${BUILD_RUN}/tests/vboot_legacy_clamshell_beep_tests + ${RUNTEST} ${BUILD_RUN}/tests/vboot_legacy_clamshell_tests + ${RUNTEST} ${BUILD_RUN}/tests/vboot_legacy_menu_tests .PHONY: run2tests run2tests: install_for_test diff --git a/firmware/lib/include/vboot_kernel.h b/firmware/lib/include/vboot_kernel.h index 567c10ad..c147c316 100644 --- a/firmware/lib/include/vboot_kernel.h +++ b/firmware/lib/include/vboot_kernel.h @@ -54,29 +54,29 @@ int VbUserConfirms(struct vb2_context *ctx, uint32_t confirm_flags); vb2_error_t VbBootNormal(struct vb2_context *ctx); /** - * Handle a developer-mode boot. + * Handle a developer-mode boot using legacy clamshell UI. */ -vb2_error_t VbBootDeveloper(struct vb2_context *ctx); +vb2_error_t VbBootDeveloperLegacyClamshell(struct vb2_context *ctx); /** - * Handle a diagnostic-mode boot. + * Handle a diagnostic-mode boot using legacy clamshell UI. */ -vb2_error_t VbBootDiagnostic(struct vb2_context *ctx); +vb2_error_t VbBootDiagnosticLegacyClamshell(struct vb2_context *ctx); /** - * Handle a recovery-mode boot. + * Handle a recovery-mode boot using legacy clamshell UI. */ -vb2_error_t VbBootRecovery(struct vb2_context *ctx); +vb2_error_t VbBootRecoveryLegacyClamshell(struct vb2_context *ctx); /** - * Handle a developer-mode boot using detachable menu ui + * Handle a developer-mode boot using legacy menu UI. */ -vb2_error_t VbBootDeveloperMenu(struct vb2_context *ctx); +vb2_error_t VbBootDeveloperLegacyMenu(struct vb2_context *ctx); /** - * Handle a recovery-mode boot using detachable menu ui + * Handle a recovery-mode boot using legacy menu UI. */ -vb2_error_t VbBootRecoveryMenu(struct vb2_context *ctx); +vb2_error_t VbBootRecoveryLegacyMenu(struct vb2_context *ctx); /** * Writes modified secdata spaces and nvdata. diff --git a/firmware/lib/include/vboot_ui_common.h b/firmware/lib/include/vboot_ui_legacy_common.h index 2587980b..ae081ae1 100644 --- a/firmware/lib/include/vboot_ui_common.h +++ b/firmware/lib/include/vboot_ui_legacy_common.h @@ -2,7 +2,7 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * - * Common code used by both vboot_ui and vboot_ui_menu. + * Common code used by both legacy_clamshell_ui and legacy_menu_ui. */ #ifndef VBOOT_REFERENCE_VBOOT_UI_COMMON_H_ diff --git a/firmware/lib/include/vboot_ui_menu_private.h b/firmware/lib/include/vboot_ui_legacy_menu_private.h index 09688b48..76edd655 100644 --- a/firmware/lib/include/vboot_ui_menu_private.h +++ b/firmware/lib/include/vboot_ui_legacy_menu_private.h @@ -2,11 +2,12 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * - * Private declarations for vboot_ui_menu.c. Defined here for easier testing. + * Private declarations for vboot_ui_legacy_menu.c. Defined here for easier + * testing. */ -#ifndef VBOOT_REFERENCE_VBOOT_UI_MENU_PRIVATE_H_ -#define VBOOT_REFERENCE_VBOOT_UI_MENU_PRIVATE_H_ +#ifndef VBOOT_REFERENCE_VBOOT_UI_LEGACY_MENU_PRIVATE_H_ +#define VBOOT_REFERENCE_VBOOT_UI_LEGACY_MENU_PRIVATE_H_ #include "2api.h" #include "vboot_api.h" @@ -90,4 +91,4 @@ typedef enum _VB_OPTIONS_MENU { VB_OPTIONS_COUNT, } VB_OPTIONS_MENU; -#endif /* VBOOT_REFERENCE_VBOOT_UI_MENU_PRIVATE_H_ */ +#endif /* VBOOT_REFERENCE_VBOOT_UI_LEGACY_MENU_PRIVATE_H_ */ diff --git a/firmware/lib/include/vboot_ui_wilco.h b/firmware/lib/include/vboot_ui_legacy_wilco.h index d6b77965..d6b77965 100644 --- a/firmware/lib/include/vboot_ui_wilco.h +++ b/firmware/lib/include/vboot_ui_legacy_wilco.h diff --git a/firmware/lib/vboot_api_kernel.c b/firmware/lib/vboot_api_kernel.c index 1c7d974c..57a827cb 100644 --- a/firmware/lib/vboot_api_kernel.c +++ b/firmware/lib/vboot_api_kernel.c @@ -397,9 +397,9 @@ vb2_error_t VbSelectAndLoadKernel(struct vb2_context *ctx, /* Recovery boot. This has UI. */ if (LEGACY_MENU_UI) - rv = VbBootRecoveryMenu(ctx); + rv = VbBootRecoveryLegacyMenu(ctx); else - rv = VbBootRecovery(ctx); + rv = VbBootRecoveryLegacyClamshell(ctx); } else if (DIAGNOSTIC_UI && vb2_nv_get(ctx, VB2_NV_DIAG_REQUEST)) { vb2_nv_set(ctx, VB2_NV_DIAG_REQUEST, 0); @@ -409,7 +409,7 @@ vb2_error_t VbSelectAndLoadKernel(struct vb2_context *ctx, * needed. This mode is also 1-shot so it's placed * before developer mode. */ - rv = VbBootDiagnostic(ctx); + rv = VbBootDiagnosticLegacyClamshell(ctx); /* * The diagnostic menu should either boot a rom, or * return either of reboot or shutdown. The following @@ -420,9 +420,9 @@ vb2_error_t VbSelectAndLoadKernel(struct vb2_context *ctx, } else if (ctx->flags & VB2_CONTEXT_DEVELOPER_MODE) { /* Developer boot. This has UI. */ if (LEGACY_MENU_UI) - rv = VbBootDeveloperMenu(ctx); + rv = VbBootDeveloperLegacyMenu(ctx); else - rv = VbBootDeveloper(ctx); + rv = VbBootDeveloperLegacyClamshell(ctx); } else { /* Normal boot */ rv = VbBootNormal(ctx); diff --git a/firmware/lib/vboot_ui.c b/firmware/lib/vboot_ui_legacy_clamshell.c index 1d8e5e5d..cc0c4175 100644 --- a/firmware/lib/vboot_ui.c +++ b/firmware/lib/vboot_ui_legacy_clamshell.c @@ -21,17 +21,17 @@ #include "vboot_kernel.h" #include "vboot_struct.h" #include "vboot_test.h" -#include "vboot_ui_common.h" -#include "vboot_ui_wilco.h" +#include "vboot_ui_legacy_common.h" +#include "vboot_ui_legacy_wilco.h" static vb2_error_t VbTryUsb(struct vb2_context *ctx) { int retval = VbTryLoadKernel(ctx, VB_DISK_FLAG_REMOVABLE); if (VB2_SUCCESS == retval) { - VB2_DEBUG("VbBootDeveloper() - booting USB\n"); + VB2_DEBUG("developer UI - booting USB\n"); } else { vb2_error_notify("Could not boot from USB\n", - "VbBootDeveloper() - no kernel found on USB\n", + "developer UI - no kernel found on USB\n", VB_BEEP_FAILED); } return retval; @@ -134,7 +134,7 @@ static vb2_error_t vb2_altfw_ui(struct vb2_context *ctx) uint32_t key = VbExKeyboardRead(); if (vb2_want_shutdown(ctx, key)) { - VB2_DEBUG("VbBootDeveloper() - shutdown requested!\n"); + VB2_DEBUG("developer UI - shutdown requested!\n"); return VBERROR_SHUTDOWN_REQUESTED; } switch (key) { @@ -143,15 +143,14 @@ static vb2_error_t vb2_altfw_ui(struct vb2_context *ctx) break; case VB_KEY_ESC: /* Escape pressed - return to developer screen */ - VB2_DEBUG("VbBootDeveloper() - user pressed Esc:" + VB2_DEBUG("developer UI - user pressed Esc; " "exit to Developer screen\n"); active = 0; break; /* We allow selection of the default '0' bootloader here */ case '0'...'9': - VB2_DEBUG("VbBootDeveloper() - " - "user pressed key '%c': Boot alternative " - "firmware\n", key); + VB2_DEBUG("developer UI - user pressed key '%c';" + "Boot alternative firmware\n", key); /* * This will not return if successful. Drop out to * developer mode on failure. @@ -160,7 +159,7 @@ static vb2_error_t vb2_altfw_ui(struct vb2_context *ctx) active = 0; break; default: - VB2_DEBUG("VbBootDeveloper() - pressed key %#x\n", key); + VB2_DEBUG("developer UI - pressed key %#x\n", key); VbCheckDisplayKey(ctx, key, NULL); break; } @@ -254,7 +253,7 @@ static vb2_error_t vb2_developer_ui(struct vb2_context *ctx) if ((ctx->flags & VB2_CONTEXT_VENDOR_DATA_SETTABLE) && VENDOR_DATA_LENGTH > 0) { vb2_error_t ret; - VB2_DEBUG("VbBootDeveloper() - Vendor data not set\n"); + VB2_DEBUG("developer UI - Vendor data not set\n"); ret = vb2_vendor_data_ui(ctx); if (ret) return ret; @@ -270,7 +269,7 @@ static vb2_error_t vb2_developer_ui(struct vb2_context *ctx) do { uint32_t key = VbExKeyboardRead(); if (vb2_want_shutdown(ctx, key)) { - VB2_DEBUG("VbBootDeveloper() - shutdown requested!\n"); + VB2_DEBUG("developer UI - shutdown requested!\n"); return VBERROR_SHUTDOWN_REQUESTED; } @@ -327,13 +326,13 @@ static vb2_error_t vb2_developer_ui(struct vb2_context *ctx) break; case VB_KEY_CTRL('D'): /* Ctrl+D = dismiss warning; advance to timeout */ - VB2_DEBUG("VbBootDeveloper() - " - "user pressed Ctrl+D; skip delay\n"); + VB2_DEBUG("developer UI - user pressed Ctrl+D; " + "skip delay\n"); ctrl_d_pressed = 1; goto fallout; case VB_KEY_CTRL('L'): - VB2_DEBUG("VbBootDeveloper() - " - "user pressed Ctrl+L; Try alt firmware\n"); + VB2_DEBUG("developer UI - user pressed Ctrl+L; " + "Try alt firmware\n"); if (allow_legacy) { vb2_error_t ret; @@ -351,15 +350,15 @@ static vb2_error_t vb2_developer_ui(struct vb2_context *ctx) */ case VB_KEY_CTRL('U'): /* Ctrl+U = try USB boot, or beep if failure */ - VB2_DEBUG("VbBootDeveloper() - " - "user pressed Ctrl+U; try USB\n"); + VB2_DEBUG("developer UI - user pressed Ctrl+U; " + "try USB\n"); if (!allow_usb) { vb2_error_notify( "WARNING: Booting from external media " "(USB/SD) has not been enabled. Refer " "to the developer-mode documentation " "for details.\n", - "VbBootDeveloper() - " + "developer UI - " "USB booting is disabled\n", VB_BEEP_NOT_ALLOWED); } else { @@ -380,13 +379,12 @@ static vb2_error_t vb2_developer_ui(struct vb2_context *ctx) break; /* We allow selection of the default '0' bootloader here */ case '0'...'9': - VB2_DEBUG("VbBootDeveloper() - " - "user pressed key '%c': Boot alternative " - "firmware\n", key); + VB2_DEBUG("developer UI - user pressed key '%c'; " + "Boot alternative firmware\n", key); vb2_try_altfw(ctx, allow_legacy, key - '0'); break; default: - VB2_DEBUG("VbBootDeveloper() - pressed key %#x\n", key); + VB2_DEBUG("developer UI - pressed key %#x\n", key); VbCheckDisplayKey(ctx, key, NULL); break; } @@ -398,7 +396,7 @@ static vb2_error_t vb2_developer_ui(struct vb2_context *ctx) /* If defaulting to legacy boot, try that unless Ctrl+D was pressed */ if (use_legacy && !ctrl_d_pressed) { - VB2_DEBUG("VbBootDeveloper() - defaulting to legacy\n"); + VB2_DEBUG("developer UI - defaulting to legacy\n"); vb2_try_altfw(ctx, allow_legacy, 0); } @@ -409,11 +407,11 @@ static vb2_error_t vb2_developer_ui(struct vb2_context *ctx) } /* Timeout or Ctrl+D; attempt loading from fixed disk */ - VB2_DEBUG("VbBootDeveloper() - trying fixed disk\n"); + VB2_DEBUG("developer UI - trying fixed disk\n"); return VbTryLoadKernel(ctx, VB_DISK_FLAG_FIXED); } -vb2_error_t VbBootDeveloper(struct vb2_context *ctx) +vb2_error_t VbBootDeveloperLegacyClamshell(struct vb2_context *ctx) { vb2_reset_power_button(); vb2_error_t retval = vb2_developer_ui(ctx); @@ -421,7 +419,7 @@ vb2_error_t VbBootDeveloper(struct vb2_context *ctx) return retval; } -vb2_error_t VbBootDiagnostic(struct vb2_context *ctx) +vb2_error_t VbBootDiagnosticLegacyClamshell(struct vb2_context *ctx) { vb2_reset_power_button(); vb2_error_t retval = vb2_diagnostics_ui(ctx); @@ -439,7 +437,7 @@ static vb2_error_t recovery_ui(struct vb2_context *ctx) const char recovery_pressed_msg[] = "^D but recovery switch is pressed\n"; - VB2_DEBUG("VbBootRecovery() start\n"); + VB2_DEBUG("recovery UI - start\n"); if (!vb2_allow_recovery(ctx)) { /* @@ -450,7 +448,7 @@ static vb2_error_t recovery_ui(struct vb2_context *ctx) * back here, thus, we won't be able to give a user a chance to * reboot to workaround a boot hiccup. */ - VB2_DEBUG("VbBootRecovery() saving recovery reason (%#x)\n", + VB2_DEBUG("recovery UI - saving recovery reason (%#x)\n", sd->recovery_reason); vb2_nv_set(ctx, VB2_NV_RECOVERY_SUBCODE, sd->recovery_reason); @@ -462,7 +460,7 @@ static vb2_error_t recovery_ui(struct vb2_context *ctx) vb2_commit_data(ctx); VbDisplayScreen(ctx, VB_SCREEN_OS_BROKEN, 0, NULL); - VB2_DEBUG("VbBootRecovery() waiting for manual recovery\n"); + VB2_DEBUG("recovery UI - waiting for manual recovery\n"); while (1) { key = VbExKeyboardRead(); VbCheckDisplayKey(ctx, key, NULL); @@ -477,7 +475,7 @@ static vb2_error_t recovery_ui(struct vb2_context *ctx) } /* Loop and wait for a recovery image */ - VB2_DEBUG("VbBootRecovery() waiting for a recovery image\n"); + VB2_DEBUG("recovery UI - waiting for a recovery image\n"); while (1) { retval = VbTryLoadKernel(ctx, VB_DISK_FLAG_REMOVABLE); @@ -550,7 +548,7 @@ static vb2_error_t recovery_ui(struct vb2_context *ctx) return VB2_SUCCESS; } -vb2_error_t VbBootRecovery(struct vb2_context *ctx) +vb2_error_t VbBootRecoveryLegacyClamshell(struct vb2_context *ctx) { vb2_error_t retval = recovery_ui(ctx); VbDisplayScreen(ctx, VB_SCREEN_BLANK, 0, NULL); diff --git a/firmware/lib/vboot_ui_common.c b/firmware/lib/vboot_ui_legacy_common.c index 65f3b368..8b6a1799 100644 --- a/firmware/lib/vboot_ui_common.c +++ b/firmware/lib/vboot_ui_legacy_common.c @@ -11,7 +11,7 @@ #include "vboot_api.h" #include "vboot_kernel.h" #include "vboot_test.h" -#include "vboot_ui_common.h" +#include "vboot_ui_legacy_common.h" static enum { POWER_BUTTON_HELD_SINCE_BOOT = 0, diff --git a/firmware/lib/vboot_ui_menu.c b/firmware/lib/vboot_ui_legacy_menu.c index 8b6ed18e..2635a7f3 100644 --- a/firmware/lib/vboot_ui_menu.c +++ b/firmware/lib/vboot_ui_legacy_menu.c @@ -19,8 +19,8 @@ #include "vboot_display.h" #include "vboot_kernel.h" #include "vboot_struct.h" -#include "vboot_ui_common.h" -#include "vboot_ui_menu_private.h" +#include "vboot_ui_legacy_common.h" +#include "vboot_ui_legacy_menu_private.h" static const char dev_disable_msg[] = "Developer mode is disabled on this device by system policy.\n" @@ -732,7 +732,7 @@ static vb2_error_t vb2_init_menus(struct vb2_context *ctx) * @param ctx Vboot2 context * @return VB2_SUCCESS, or non-zero error code if error. */ -static vb2_error_t vb2_developer_menu(struct vb2_context *ctx) +static vb2_error_t vb2_developer_legacy_menu(struct vb2_context *ctx) { struct vb2_gbb_header *gbb = vb2_get_gbb(ctx); vb2_error_t ret; @@ -789,7 +789,7 @@ static vb2_error_t vb2_developer_menu(struct vb2_context *ctx) break; /* We allow selection of the default '0' bootloader here */ case '0'...'9': - VB2_DEBUG("VbBootDeveloper() - " + VB2_DEBUG("developer UI - " "user pressed key '%c': Boot alternative " "firmware\n", key); vb2_try_altfw(ctx, altfw_allowed, key - '0'); @@ -824,12 +824,12 @@ static vb2_error_t vb2_developer_menu(struct vb2_context *ctx) } /* Developer mode entry point. */ -vb2_error_t VbBootDeveloperMenu(struct vb2_context *ctx) +vb2_error_t VbBootDeveloperLegacyMenu(struct vb2_context *ctx) { vb2_error_t retval = vb2_init_menus(ctx); if (VB2_SUCCESS != retval) return retval; - retval = vb2_developer_menu(ctx); + retval = vb2_developer_legacy_menu(ctx); VbDisplayScreen(ctx, VB_SCREEN_BLANK, 0, NULL); return retval; } @@ -905,7 +905,7 @@ static vb2_error_t recovery_ui(struct vb2_context *ctx) } /* Recovery mode entry point. */ -vb2_error_t VbBootRecoveryMenu(struct vb2_context *ctx) +vb2_error_t VbBootRecoveryLegacyMenu(struct vb2_context *ctx) { vb2_error_t retval = vb2_init_menus(ctx); if (VB2_SUCCESS != retval) diff --git a/firmware/lib/vboot_ui_wilco.c b/firmware/lib/vboot_ui_legacy_wilco.c index ff4e229e..b814c249 100644 --- a/firmware/lib/vboot_ui_wilco.c +++ b/firmware/lib/vboot_ui_legacy_wilco.c @@ -11,8 +11,8 @@ #include "2sysincludes.h" #include "vboot_api.h" #include "vboot_display.h" -#include "vboot_ui_common.h" -#include "vboot_ui_wilco.h" +#include "vboot_ui_legacy_common.h" +#include "vboot_ui_legacy_wilco.h" static inline int is_vowel(uint32_t key) { diff --git a/tests/vboot_api_kernel4_tests.c b/tests/vboot_api_kernel4_tests.c index d57ab062..91ba5198 100644 --- a/tests/vboot_api_kernel4_tests.c +++ b/tests/vboot_api_kernel4_tests.c @@ -127,7 +127,7 @@ vb2_error_t VbTryLoadKernel(struct vb2_context *c, uint32_t get_info_flags) return vbboot_retval; } -vb2_error_t VbBootDeveloper(struct vb2_context *c) +vb2_error_t VbBootDeveloperLegacyClamshell(struct vb2_context *c) { shared->kernel_version_tpm = new_version; @@ -137,7 +137,7 @@ vb2_error_t VbBootDeveloper(struct vb2_context *c) return vbboot_retval; } -vb2_error_t VbBootRecovery(struct vb2_context *c) +vb2_error_t VbBootRecoveryLegacyClamshell(struct vb2_context *c) { shared->kernel_version_tpm = new_version; @@ -147,7 +147,7 @@ vb2_error_t VbBootRecovery(struct vb2_context *c) return vbboot_retval; } -vb2_error_t VbBootDiagnostic(struct vb2_context *c) +vb2_error_t VbBootDiagnosticLegacyClamshell(struct vb2_context *c) { if (vbboot_retval == -4) return VB2_ERROR_MOCK; diff --git a/tests/vboot_api_devmode_tests.c b/tests/vboot_legacy_clamshell_beep_tests.c index 3706dbe7..5edd3d19 100644 --- a/tests/vboot_api_devmode_tests.c +++ b/tests/vboot_legacy_clamshell_beep_tests.c @@ -272,7 +272,7 @@ static void VbBootDeveloperSoundTest(void) kbd_fire_at = test[i].keypress_at_count; max_events = test[i].num_events; expected_event = test[i].notes; - (void) VbBootDeveloper(ctx); + (void) VbBootDeveloperLegacyClamshell(ctx); VbExBeep(0, 0); /* Dummy call to determine end time */ VB2_DEBUG("INFO: matched %d total %d expected %d\n", matched_events, current_event, test[i].num_events); diff --git a/tests/vboot_api_kernel2_tests.c b/tests/vboot_legacy_clamshell_tests.c index d9cbea58..baf60827 100644 --- a/tests/vboot_api_kernel2_tests.c +++ b/tests/vboot_legacy_clamshell_tests.c @@ -19,7 +19,7 @@ #include "vboot_kernel.h" #include "vboot_struct.h" #include "vboot_test.h" -#include "vboot_ui_common.h" +#include "vboot_ui_legacy_common.h" /* Mock data */ static uint8_t shared_data[VB_SHARED_DATA_MIN_SIZE]; @@ -514,12 +514,12 @@ static void VbBootDevTest(void) { int key; - VB2_DEBUG("Testing VbBootDeveloper()...\n"); + VB2_DEBUG("Testing VbBootDeveloperLegacyClamshell()...\n"); /* Proceed after timeout */ ResetMocks(); vbtlk_expect_fixed = 1; - TEST_EQ(VbBootDeveloper(ctx), VB2_ERROR_MOCK, "Timeout"); + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_ERROR_MOCK, "Timeout"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING, " warning screen"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, @@ -531,7 +531,7 @@ static void VbBootDevTest(void) gbb.flags |= VB2_GBB_FLAG_DEFAULT_DEV_BOOT_LEGACY | VB2_GBB_FLAG_FORCE_DEV_BOOT_LEGACY; vbtlk_expect_fixed = 1; - TEST_EQ(VbBootDeveloper(ctx), VB2_ERROR_MOCK, "Timeout"); + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_ERROR_MOCK, "Timeout"); TEST_EQ(vbexlegacy_called, 1, " try legacy"); TEST_EQ(altfw_num, 0, " check altfw_num"); @@ -540,7 +540,7 @@ static void VbBootDevTest(void) gbb.flags |= VB2_GBB_FLAG_DEFAULT_DEV_BOOT_LEGACY | VB2_GBB_FLAG_FORCE_DEV_BOOT_LEGACY; vbtlk_expect_fixed = 1; - TEST_EQ(VbBootDeveloper(ctx), VB2_ERROR_MOCK, "Timeout"); + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_ERROR_MOCK, "Timeout"); TEST_EQ(vbexlegacy_called, 1, " try legacy"); TEST_EQ(altfw_num, 0, " check altfw_num"); @@ -551,7 +551,7 @@ static void VbBootDevTest(void) VB2_DEV_DEFAULT_BOOT_LEGACY); vb2_nv_set(ctx, VB2_NV_DEV_BOOT_LEGACY, 1); vbtlk_expect_fixed = 1; - TEST_EQ(VbBootDeveloper(ctx), VB2_ERROR_MOCK, "Timeout"); + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_ERROR_MOCK, "Timeout"); TEST_EQ(vbexlegacy_called, 1, " try legacy"); TEST_EQ(altfw_num, 0, " check altfw_num"); @@ -560,7 +560,7 @@ static void VbBootDevTest(void) vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_LEGACY); vbtlk_expect_fixed = 1; - TEST_EQ(VbBootDeveloper(ctx), VB2_ERROR_MOCK, "Timeout"); + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_ERROR_MOCK, "Timeout"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); /* Proceed to USB after timeout if boot USB and default boot @@ -571,14 +571,14 @@ static void VbBootDevTest(void) vb2_nv_set(ctx, VB2_NV_DEV_BOOT_USB, 1); vbtlk_retval = VB2_SUCCESS; vbtlk_expect_removable = 1; - TEST_EQ(VbBootDeveloper(ctx), 0, "Ctrl+U USB"); + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), 0, "Ctrl+U USB"); /* Proceed to USB boot mode only if enabled */ ResetMocks(); vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_USB); vbtlk_expect_fixed = 1; - TEST_EQ(VbBootDeveloper(ctx), VB2_ERROR_MOCK, "Timeout"); + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_ERROR_MOCK, "Timeout"); /* If no USB tries fixed disk */ ResetMocks(); @@ -587,14 +587,16 @@ static void VbBootDevTest(void) VB2_DEV_DEFAULT_BOOT_USB); vbtlk_expect_fixed = 1; vbtlk_expect_removable = 1; - TEST_EQ(VbBootDeveloper(ctx), VB2_ERROR_MOCK, "Ctrl+U enabled"); + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_ERROR_MOCK, + "Ctrl+U enabled"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); /* Up arrow is uninteresting / passed to VbCheckDisplayKey() */ ResetMocks(); mock_keypress[0] = VB_KEY_UP; vbtlk_expect_fixed = 1; - TEST_EQ(VbBootDeveloper(ctx), VB2_ERROR_MOCK, "Up arrow"); + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_ERROR_MOCK, + "Up arrow"); /* Shutdown requested in loop */ ResetMocks(); @@ -602,7 +604,7 @@ static void VbBootDevTest(void) mock_gpio[0].count = 2; mock_gpio[1].gpio_flags = GPIO_SHUTDOWN; mock_gpio[1].count = 1; - TEST_EQ(VbBootDeveloper(ctx), + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VBERROR_SHUTDOWN_REQUESTED, "Shutdown requested"); TEST_NEQ(audio_looping_calls_left, 0, " aborts audio"); @@ -610,7 +612,7 @@ static void VbBootDevTest(void) /* Shutdown requested by keyboard in loop */ ResetMocks(); mock_keypress[0] = VB_BUTTON_POWER_SHORT_PRESS; - TEST_EQ(VbBootDeveloper(ctx), + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VBERROR_SHUTDOWN_REQUESTED, "Shutdown requested by keyboard"); @@ -619,7 +621,7 @@ static void VbBootDevTest(void) sd->flags = VB2_SD_FLAG_DEV_MODE_ENABLED; mock_keypress[0] = ' '; mock_keypress[1] = VB_KEY_ENTER; - TEST_EQ(VbBootDeveloper(ctx), VBERROR_REBOOT_REQUIRED, + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VBERROR_REBOOT_REQUIRED, "Space = tonorm"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING, " warning screen"); @@ -637,7 +639,8 @@ static void VbBootDevTest(void) mock_keypress[1] = ' '; mock_keypress[2] = VB_KEY_ESC; vbtlk_expect_fixed = 1; - TEST_EQ(VbBootDeveloper(ctx), VB2_ERROR_MOCK, "Space-space"); + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_ERROR_MOCK, + "Space-space"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING, " warning screen"); TEST_EQ(screens_displayed[1], VB_SCREEN_DEVELOPER_TO_NORM, @@ -651,7 +654,8 @@ static void VbBootDevTest(void) mock_keypress[0] = VB_KEY_ENTER; mock_keypress[1] = VB_KEY_ENTER; vbtlk_expect_fixed = 1; - TEST_EQ(VbBootDeveloper(ctx), VB2_ERROR_MOCK, "Enter ignored"); + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_ERROR_MOCK, + "Enter ignored"); /* Enter does if GBB flag set */ ResetMocks(); @@ -659,7 +663,7 @@ static void VbBootDevTest(void) gbb.flags |= VB2_GBB_FLAG_ENTER_TRIGGERS_TONORM; mock_keypress[0] = VB_KEY_ENTER; mock_keypress[1] = VB_KEY_ENTER; - TEST_EQ(VbBootDeveloper(ctx), VBERROR_REBOOT_REQUIRED, + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VBERROR_REBOOT_REQUIRED, "Enter = tonorm"); /* Tonorm ignored if GBB forces dev switch on */ @@ -669,7 +673,7 @@ static void VbBootDevTest(void) mock_keypress[0] = ' '; mock_keypress[1] = VB_KEY_ENTER; vbtlk_expect_fixed = 1; - TEST_EQ(VbBootDeveloper(ctx), VB2_ERROR_MOCK, + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_ERROR_MOCK, "Can't tonorm gbb-dev"); /* Shutdown requested at tonorm screen */ @@ -677,7 +681,7 @@ static void VbBootDevTest(void) sd->flags = VB2_SD_FLAG_DEV_MODE_ENABLED; mock_keypress[0] = ' '; MockGpioAfter(3, GPIO_SHUTDOWN); - TEST_EQ(VbBootDeveloper(ctx), + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VBERROR_SHUTDOWN_REQUESTED, "Shutdown requested at tonorm"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING, @@ -689,7 +693,7 @@ static void VbBootDevTest(void) ResetMocks(); sd->flags = VB2_SD_FLAG_DEV_MODE_ENABLED; mock_keypress[0] = VB_BUTTON_POWER_SHORT_PRESS; - TEST_EQ(VbBootDeveloper(ctx), + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VBERROR_SHUTDOWN_REQUESTED, "Shutdown requested by keyboard at nonorm"); @@ -697,7 +701,7 @@ static void VbBootDevTest(void) ResetMocks(); mock_keypress[0] = VB_KEY_CTRL('D'); vbtlk_expect_fixed = 1; - TEST_EQ(VbBootDeveloper(ctx), VB2_ERROR_MOCK, "Ctrl+D"); + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_ERROR_MOCK, "Ctrl+D"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " recovery reason"); TEST_NEQ(audio_looping_calls_left, 0, " aborts audio"); @@ -708,14 +712,15 @@ static void VbBootDevTest(void) mock_keypress[0] = VB_KEY_CTRL('D'); gbb.flags |= VB2_GBB_FLAG_DEFAULT_DEV_BOOT_LEGACY; vbtlk_expect_fixed = 1; - TEST_EQ(VbBootDeveloper(ctx), VB2_ERROR_MOCK, "Ctrl+D"); + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_ERROR_MOCK, "Ctrl+D"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); /* Ctrl+L tries legacy boot mode only if enabled */ ResetMocks(); mock_keypress[0] = VB_KEY_CTRL('L'); vbtlk_expect_fixed = 1; - TEST_EQ(VbBootDeveloper(ctx), VB2_ERROR_MOCK, "Ctrl+L normal"); + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_ERROR_MOCK, + "Ctrl+L normal"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); /* Enter altfw menu and time out */ @@ -723,7 +728,7 @@ static void VbBootDevTest(void) MockGpioAfter(1000, GPIO_SHUTDOWN); gbb.flags |= VB2_GBB_FLAG_FORCE_DEV_BOOT_LEGACY; mock_keypress[0] = VB_KEY_CTRL('L'); - TEST_EQ(VbBootDeveloper(ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VBERROR_SHUTDOWN_REQUESTED, "Ctrl+L force legacy"); TEST_EQ(vbexlegacy_called, 0, " try legacy"); @@ -733,7 +738,7 @@ static void VbBootDevTest(void) mock_keypress[0] = VB_KEY_CTRL('L'); mock_keypress[1] = '0'; vbtlk_expect_fixed = 1; - TEST_EQ(VbBootDeveloper(ctx), VB2_ERROR_MOCK, + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_ERROR_MOCK, "Ctrl+L force legacy"); TEST_EQ(vbexlegacy_called, 1, " try legacy"); TEST_EQ(altfw_num, 0, " check altfw_num"); @@ -744,7 +749,7 @@ static void VbBootDevTest(void) mock_keypress[0] = VB_KEY_CTRL('L'); mock_keypress[1] = VB_KEY_ESC; vbtlk_expect_fixed = 1; - TEST_EQ(VbBootDeveloper(ctx), VB2_ERROR_MOCK, + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_ERROR_MOCK, "Ctrl+L nv legacy"); TEST_EQ(vbexlegacy_called, 0, " try legacy"); @@ -754,7 +759,7 @@ static void VbBootDevTest(void) mock_keypress[0] = VB_KEY_CTRL('L'); mock_keypress[1] = '0'; vbtlk_expect_fixed = 1; - TEST_EQ(VbBootDeveloper(ctx), VB2_ERROR_MOCK, + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_ERROR_MOCK, "Ctrl+L nv legacy"); TEST_EQ(vbexlegacy_called, 1, " try legacy"); TEST_EQ(altfw_num, 0, " check altfw_num"); @@ -765,7 +770,7 @@ static void VbBootDevTest(void) mock_keypress[0] = VB_KEY_CTRL('L'); mock_keypress[1] = '0'; vbtlk_expect_fixed = 1; - TEST_EQ(VbBootDeveloper(ctx), VB2_ERROR_MOCK, + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_ERROR_MOCK, "Ctrl+L fwmp legacy"); TEST_EQ(vbexlegacy_called, 1, " fwmp legacy"); TEST_EQ(altfw_num, 0, " check altfw_num"); @@ -775,14 +780,15 @@ static void VbBootDevTest(void) ResetMocks(); mock_keypress[0] = key; vbtlk_expect_fixed = 1; - TEST_EQ(VbBootDeveloper(ctx), VB2_ERROR_MOCK, "'1' normal"); + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_ERROR_MOCK, + "'1' normal"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); ResetMocks(); gbb.flags |= VB2_GBB_FLAG_FORCE_DEV_BOOT_LEGACY; mock_keypress[0] = key; vbtlk_expect_fixed = 1; - TEST_EQ(VbBootDeveloper(ctx), VB2_ERROR_MOCK, + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_ERROR_MOCK, "Ctrl+L force legacy"); TEST_EQ(vbexlegacy_called, 1, " try legacy"); TEST_EQ(altfw_num, key - '0', " check altfw_num"); @@ -791,7 +797,7 @@ static void VbBootDevTest(void) vb2_nv_set(ctx, VB2_NV_DEV_BOOT_LEGACY, 1); mock_keypress[0] = key; vbtlk_expect_fixed = 1; - TEST_EQ(VbBootDeveloper(ctx), VB2_ERROR_MOCK, + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_ERROR_MOCK, "Ctrl+L nv legacy"); TEST_EQ(vbexlegacy_called, 1, " try legacy"); TEST_EQ(altfw_num, key - '0', " check altfw_num"); @@ -800,7 +806,7 @@ static void VbBootDevTest(void) fwmp->flags |= VB2_SECDATA_FWMP_DEV_ENABLE_LEGACY; mock_keypress[0] = key; vbtlk_expect_fixed = 1; - TEST_EQ(VbBootDeveloper(ctx), VB2_ERROR_MOCK, + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_ERROR_MOCK, "Ctrl+L fwmp legacy"); TEST_EQ(vbexlegacy_called, 1, " fwmp legacy"); TEST_EQ(altfw_num, key - '0', " check altfw_num"); @@ -810,7 +816,8 @@ static void VbBootDevTest(void) ResetMocks(); mock_keypress[0] = VB_KEY_CTRL('U'); vbtlk_expect_fixed = 1; - TEST_EQ(VbBootDeveloper(ctx), VB2_ERROR_MOCK, "Ctrl+U normal"); + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_ERROR_MOCK, + "Ctrl+U normal"); /* Ctrl+U enabled, with good USB boot */ ResetMocks(); @@ -818,7 +825,7 @@ static void VbBootDevTest(void) mock_keypress[0] = VB_KEY_CTRL('U'); vbtlk_retval = VB2_SUCCESS; vbtlk_expect_removable = 1; - TEST_EQ(VbBootDeveloper(ctx), 0, "Ctrl+U USB"); + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), 0, "Ctrl+U USB"); /* Ctrl+U enabled via GBB */ ResetMocks(); @@ -826,7 +833,7 @@ static void VbBootDevTest(void) mock_keypress[0] = VB_KEY_CTRL('U'); vbtlk_retval = VB2_SUCCESS; vbtlk_expect_removable = 1; - TEST_EQ(VbBootDeveloper(ctx), 0, "Ctrl+U force USB"); + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), 0, "Ctrl+U force USB"); /* Ctrl+U enabled via FWMP */ ResetMocks(); @@ -834,7 +841,7 @@ static void VbBootDevTest(void) mock_keypress[0] = VB_KEY_CTRL('U'); vbtlk_retval = VB2_SUCCESS; vbtlk_expect_removable = 1; - TEST_EQ(VbBootDeveloper(ctx), 0, "Ctrl+U force USB"); + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), 0, "Ctrl+U force USB"); /* If no USB, eventually times out and tries fixed disk */ ResetMocks(); @@ -844,7 +851,8 @@ static void VbBootDevTest(void) which the expected VbTryLoadKernel calls occur. */ vbtlk_expect_fixed = 1; vbtlk_expect_removable = 1; - TEST_EQ(VbBootDeveloper(ctx), VB2_ERROR_MOCK, "Ctrl+U enabled"); + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_ERROR_MOCK, + "Ctrl+U enabled"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " recovery reason"); @@ -855,7 +863,7 @@ static void VbBootDevTest(void) fwmp->flags |= VB2_SECDATA_FWMP_DEV_DISABLE_BOOT; mock_keypress[0] = VB_KEY_ESC; /* Just causes TONORM again */ mock_keypress[1] = VB_KEY_ENTER; - TEST_EQ(VbBootDeveloper(ctx), VBERROR_REBOOT_REQUIRED, + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VBERROR_REBOOT_REQUIRED, "FWMP dev disabled"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_TO_NORM, " tonorm screen"); @@ -871,7 +879,7 @@ static void VbBootDevTest(void) sd->flags = VB2_SD_FLAG_DEV_MODE_ENABLED; fwmp->flags |= VB2_SECDATA_FWMP_DEV_DISABLE_BOOT; MockGpioAfter(1, GPIO_SHUTDOWN); - TEST_EQ(VbBootDeveloper(ctx), + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VBERROR_SHUTDOWN_REQUESTED, "Shutdown requested when dev disabled"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_TO_NORM, @@ -882,7 +890,7 @@ static void VbBootDevTest(void) sd->flags = VB2_SD_FLAG_DEV_MODE_ENABLED; fwmp->flags |= VB2_SECDATA_FWMP_DEV_DISABLE_BOOT; mock_keypress[0] = VB_BUTTON_POWER_SHORT_PRESS; - TEST_EQ(VbBootDeveloper(ctx), + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VBERROR_SHUTDOWN_REQUESTED, "Shutdown requested by keyboard when dev disabled"); @@ -901,7 +909,7 @@ static void VbBootDevVendorDataTest(void) mock_keypress[4] = '1'; mock_keypress[5] = VB_KEY_ENTER; /* Set vendor data */ mock_keypress[6] = VB_KEY_ENTER; /* Confirm vendor data (Default YES) */ - TEST_EQ(VbBootDeveloper(ctx), VBERROR_REBOOT_REQUIRED, + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VBERROR_REBOOT_REQUIRED, "Enter set vendor data, don't confirm, esc"); TEST_EQ(set_vendor_data_called, 1, " VbExSetVendorData() called"); TEST_STR_EQ(set_vendor_data, "4321", " Vendor data correct"); @@ -919,7 +927,7 @@ static void VbBootDevVendorDataTest(void) mock_keypress[7] = VB_KEY_ENTER; /* Do not confirm vendor data */ mock_keypress[8] = VB_KEY_ESC; /* Escape to boot */ vbtlk_expect_fixed = 1; - TEST_EQ(VbBootDeveloper(ctx), VB2_ERROR_MOCK, + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_ERROR_MOCK, "Enter set vendor data, don't confirm, esc"); TEST_EQ(set_vendor_data_called, 0, " VbExSetVendorData() not called"); @@ -938,7 +946,7 @@ static void VbBootDevVendorDataTest(void) mock_keypress[9] = 'B'; mock_keypress[10] = VB_KEY_ENTER; /* Set vendor data */ mock_keypress[11] = VB_KEY_ENTER; /* Confirm vendor data */ - TEST_EQ(VbBootDeveloper(ctx), VBERROR_REBOOT_REQUIRED, + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VBERROR_REBOOT_REQUIRED, "Enter set vendor data esc, don't confirm, change last character"); TEST_EQ(set_vendor_data_called, 1, " VbExSetVendorData() called"); TEST_STR_EQ(set_vendor_data, "432B", " Vendor data correct"); @@ -954,7 +962,7 @@ static void VbBootDevVendorDataTest(void) mock_keypress[5] = '5'; mock_keypress[6] = VB_KEY_ENTER; /* Set vendor data */ mock_keypress[7] = VB_KEY_ENTER; /* Confirm vendor data (Default YES) */ - TEST_EQ(VbBootDeveloper(ctx), VBERROR_REBOOT_REQUIRED, + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VBERROR_REBOOT_REQUIRED, "Enter set vendor data extra keys ignored"); TEST_EQ(set_vendor_data_called, 1, " VbExSetVendorData() called"); TEST_STR_EQ(set_vendor_data, "4321", " Vendor data correct"); @@ -969,7 +977,7 @@ static void VbBootDevVendorDataTest(void) mock_keypress[4] = 'z'; mock_keypress[5] = VB_KEY_ENTER; /* Set vendor data */ mock_keypress[6] = VB_KEY_ENTER; /* Confirm vendor data (Default YES) */ - TEST_EQ(VbBootDeveloper(ctx), VBERROR_REBOOT_REQUIRED, + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VBERROR_REBOOT_REQUIRED, "Enter set vendor data converts case"); TEST_EQ(set_vendor_data_called, 1, " VbExSetVendorData() called"); TEST_STR_EQ(set_vendor_data, "ABYZ", " Vendor data correct"); @@ -988,7 +996,7 @@ static void VbBootDevVendorDataTest(void) mock_keypress[8] = '1'; mock_keypress[9] = VB_KEY_ENTER; /* Set vendor data */ mock_keypress[10] = VB_KEY_ENTER; /* Confirm vendor data (Default YES) */ - TEST_EQ(VbBootDeveloper(ctx), VBERROR_REBOOT_REQUIRED, + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VBERROR_REBOOT_REQUIRED, "Enter set vendor data backspace works"); TEST_EQ(set_vendor_data_called, 1, " VbExSetVendorData() called"); TEST_STR_EQ(set_vendor_data, "A321", " Vendor data correct"); @@ -1008,7 +1016,7 @@ static void VbBootDevVendorDataTest(void) mock_keypress[9] = '1'; mock_keypress[10] = VB_KEY_ENTER; /* Set vendor data */ mock_keypress[11] = VB_KEY_ENTER; /* Confirm vendor data (Default YES) */ - TEST_EQ(VbBootDeveloper(ctx), VBERROR_REBOOT_REQUIRED, + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VBERROR_REBOOT_REQUIRED, "Enter set vendor data invalid chars don't print"); TEST_EQ(set_vendor_data_called, 1, " VbExSetVendorData() called"); TEST_STR_EQ(set_vendor_data, "4321", " Vendor data correct"); @@ -1026,7 +1034,7 @@ static void VbBootDevVendorDataTest(void) mock_keypress[7] = '0'; mock_keypress[8] = VB_KEY_ENTER; /* Set vendor data */ mock_keypress[9] = VB_KEY_ENTER; /* Confirm vendor data (Default YES) */ - TEST_EQ(VbBootDeveloper(ctx), VBERROR_REBOOT_REQUIRED, + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VBERROR_REBOOT_REQUIRED, "Enter set vendor data invalid chars don't print with backspace"); TEST_EQ(set_vendor_data_called, 1, " VbExSetVendorData() called"); TEST_STR_EQ(set_vendor_data, "3210", " Vendor data correct"); @@ -1044,7 +1052,7 @@ static void VbBootDevVendorDataTest(void) mock_keypress[7] = '1'; mock_keypress[8] = VB_KEY_ENTER; /* Set vendor data */ mock_keypress[9] = VB_KEY_ENTER; /* Confirm vendor data (Default YES) */ - TEST_EQ(VbBootDeveloper(ctx), VBERROR_REBOOT_REQUIRED, + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VBERROR_REBOOT_REQUIRED, "Enter set vendor data backspace only doesn't underrun"); TEST_EQ(set_vendor_data_called, 1, " VbExSetVendorData() called"); TEST_STR_EQ(set_vendor_data, "4321", " Vendor data correct"); @@ -1064,7 +1072,7 @@ static void VbBootDevVendorDataTest(void) mock_keypress[9] = 'D'; mock_keypress[10] = VB_KEY_ENTER; /* Set vendor data */ mock_keypress[11] = VB_KEY_ENTER; /* Confirm vendor data (Default YES) */ - TEST_EQ(VbBootDeveloper(ctx), VBERROR_REBOOT_REQUIRED, + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VBERROR_REBOOT_REQUIRED, "Enter set vendor data vowels not allowed after first char"); TEST_EQ(set_vendor_data_called, 1, " VbExSetVendorData() called"); TEST_STR_EQ(set_vendor_data, "ABCD", " Vendor data correct"); @@ -1082,7 +1090,7 @@ static void VbBootDevVendorDataTest(void) mock_keypress[5] = VB_KEY_ENTER; mock_keypress[6] = VB_KEY_ESC; vbtlk_expect_fixed = 1; - TEST_EQ(VbBootDeveloper(ctx), VB2_ERROR_MOCK, + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_ERROR_MOCK, "Enter set vendor data too short"); TEST_EQ(set_vendor_data_called, 0, " VbExSetVendorData() not called"); @@ -1092,7 +1100,7 @@ static void VbBootDevVendorDataTest(void) mock_keypress[0] = VB_KEY_ENTER; /* Enter vendor data setting */ mock_keypress[1] = VB_KEY_ESC; vbtlk_expect_fixed = 1; - TEST_EQ(VbBootDeveloper(ctx), VB2_ERROR_MOCK, + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_ERROR_MOCK, "Enter set vendor data esc from set screen"); TEST_EQ(set_vendor_data_called, 0, " VbExSetVendorData() not called"); @@ -1106,7 +1114,7 @@ static void VbBootDevVendorDataTest(void) mock_keypress[4] = '1'; mock_keypress[5] = VB_KEY_ESC; vbtlk_expect_fixed = 1; - TEST_EQ(VbBootDeveloper(ctx), VB2_ERROR_MOCK, + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_ERROR_MOCK, "Enter set vendor data esc from set screen with tag"); TEST_EQ(set_vendor_data_called, 0, " VbExSetVendorData() not called"); @@ -1121,7 +1129,7 @@ static void VbBootDevVendorDataTest(void) mock_keypress[5] = VB_KEY_ENTER; /* Set vendor data */ mock_keypress[6] = VB_KEY_ESC; vbtlk_expect_fixed = 1; - TEST_EQ(VbBootDeveloper(ctx), VB2_ERROR_MOCK, + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_ERROR_MOCK, "Enter set vendor data esc from set screen"); TEST_EQ(set_vendor_data_called, 0, " VbExSetVendorData() not called"); @@ -1130,7 +1138,7 @@ static void VbBootDevVendorDataTest(void) ctx->flags |= VB2_CONTEXT_VENDOR_DATA_SETTABLE; mock_keypress[0] = VB_KEY_ESC; /* Enter vendor data setting */ vbtlk_expect_fixed = 1; - TEST_EQ(VbBootDeveloper(ctx), VB2_ERROR_MOCK, + TEST_EQ(VbBootDeveloperLegacyClamshell(ctx), VB2_ERROR_MOCK, "Enter set vendor data esc, don't confirm, change last character"); TEST_EQ(set_vendor_data_called, 0, " VbExSetVendorData() not called"); @@ -1164,25 +1172,26 @@ static void VbBootRecTestGpio(uint32_t first, uint32_t second, uint32_t third, vbtlk_expect_removable = 1; if (confirm) { - TEST_EQ(VbBootRecovery(ctx), VBERROR_EC_REBOOT_TO_RO_REQUIRED, - msg); + TEST_EQ(VbBootRecoveryLegacyClamshell(ctx), + VBERROR_EC_REBOOT_TO_RO_REQUIRED, msg); TEST_EQ(virtdev_set, 1, " virtual dev mode on"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_DEV_BOOT_USB), !!USB_BOOT_ON_DEV, " NV_DEV_BOOT_USB enabled"); } else { - TEST_EQ(VbBootRecovery(ctx), VBERROR_SHUTDOWN_REQUESTED, msg); + TEST_EQ(VbBootRecoveryLegacyClamshell(ctx), + VBERROR_SHUTDOWN_REQUESTED, msg); TEST_EQ(virtdev_set, 0, " virtual dev mode off"); } } static void VbBootRecTest(void) { - VB2_DEBUG("Testing VbBootRecovery()...\n"); + VB2_DEBUG("Testing VbBootRecoveryLegacyClamshell()...\n"); /* Shutdown requested in loop */ ResetMocks(); MockGpioAfter(10, GPIO_SHUTDOWN); - TEST_EQ(VbBootRecovery(ctx), + TEST_EQ(VbBootRecoveryLegacyClamshell(ctx), VBERROR_SHUTDOWN_REQUESTED, "Shutdown requested"); @@ -1194,7 +1203,7 @@ static void VbBootRecTest(void) /* Shutdown requested by keyboard */ ResetMocks(); mock_keypress[0] = VB_BUTTON_POWER_SHORT_PRESS; - TEST_EQ(VbBootRecovery(ctx), + TEST_EQ(VbBootRecoveryLegacyClamshell(ctx), VBERROR_SHUTDOWN_REQUESTED, "Shutdown requested by keyboard"); @@ -1212,7 +1221,7 @@ static void VbBootRecTest(void) trust_ec = 1; vbtlk_retval = VB2_ERROR_LK_NO_DISK_FOUND; vbtlk_expect_removable = 1; - TEST_EQ(VbBootRecovery(ctx), + TEST_EQ(VbBootRecoveryLegacyClamshell(ctx), VBERROR_SHUTDOWN_REQUESTED, "Ignore power button held on boot"); TEST_EQ(screens_displayed[0], VB_SCREEN_RECOVERY_INSERT, @@ -1225,7 +1234,7 @@ static void VbBootRecTest(void) mock_num_disks[0] = 1; mock_num_disks[1] = 1; mock_num_disks[2] = 1; - TEST_EQ(VbBootRecovery(ctx), + TEST_EQ(VbBootRecoveryLegacyClamshell(ctx), VBERROR_SHUTDOWN_REQUESTED, "Broken"); TEST_EQ(screens_displayed[0], VB_SCREEN_OS_BROKEN, @@ -1237,7 +1246,7 @@ static void VbBootRecTest(void) mock_num_disks[0] = 1; mock_num_disks[1] = 1; sd->flags |= VB2_SD_FLAG_DEV_MODE_ENABLED; - TEST_EQ(VbBootRecovery(ctx), + TEST_EQ(VbBootRecoveryLegacyClamshell(ctx), VBERROR_SHUTDOWN_REQUESTED, "Broken (dev)"); TEST_EQ(screens_displayed[0], VB_SCREEN_OS_BROKEN, @@ -1249,7 +1258,7 @@ static void VbBootRecTest(void) gbb.flags |= VB2_GBB_FLAG_FORCE_MANUAL_RECOVERY; vbtlk_retval = VB2_ERROR_LK_NO_DISK_FOUND; vbtlk_expect_removable = 1; - TEST_EQ(VbBootRecovery(ctx), + TEST_EQ(VbBootRecoveryLegacyClamshell(ctx), VBERROR_SHUTDOWN_REQUESTED, "Insert (forced by GBB)"); TEST_EQ(screens_displayed[0], VB_SCREEN_RECOVERY_INSERT, @@ -1261,7 +1270,7 @@ static void VbBootRecTest(void) mock_num_disks[0] = 1; mock_num_disks[1] = 1; sd->flags |= VB2_SD_FLAG_MANUAL_RECOVERY; - TEST_EQ(VbBootRecovery(ctx), + TEST_EQ(VbBootRecoveryLegacyClamshell(ctx), VBERROR_SHUTDOWN_REQUESTED, "No remove in rec"); TEST_EQ(screens_displayed[0], VB_SCREEN_OS_BROKEN, @@ -1272,7 +1281,7 @@ static void VbBootRecTest(void) MockGpioAfter(10, GPIO_SHUTDOWN); mock_num_disks[0] = 0; mock_num_disks[1] = 1; - TEST_EQ(VbBootRecovery(ctx), + TEST_EQ(VbBootRecoveryLegacyClamshell(ctx), VBERROR_SHUTDOWN_REQUESTED, "Remove"); TEST_EQ(screens_displayed[0], VB_SCREEN_OS_BROKEN, @@ -1282,7 +1291,7 @@ static void VbBootRecTest(void) ResetMocks(); MockGpioAfter(10, GPIO_SHUTDOWN); mock_num_disks[0] = -1; - TEST_EQ(VbBootRecovery(ctx), + TEST_EQ(VbBootRecoveryLegacyClamshell(ctx), VBERROR_SHUTDOWN_REQUESTED, "Bad disk count"); TEST_EQ(screens_displayed[0], VB_SCREEN_OS_BROKEN, @@ -1294,7 +1303,7 @@ static void VbBootRecTest(void) MockGpioAfter(10, GPIO_SHUTDOWN); mock_keypress[0] = VB_KEY_CTRL('D'); trust_ec = 0; - TEST_EQ(VbBootRecovery(ctx), + TEST_EQ(VbBootRecoveryLegacyClamshell(ctx), VBERROR_SHUTDOWN_REQUESTED, "Ctrl+D ignored if EC not trusted"); TEST_EQ(virtdev_set, 0, " virtual dev mode off"); @@ -1307,7 +1316,7 @@ static void VbBootRecTest(void) MockGpioAfter(10, GPIO_SHUTDOWN); mock_keypress[0] = VB_KEY_CTRL('D'); vbtlk_expect_removable = 1; - TEST_EQ(VbBootRecovery(ctx), + TEST_EQ(VbBootRecoveryLegacyClamshell(ctx), VBERROR_SHUTDOWN_REQUESTED, "Ctrl+D ignored if already in dev mode"); TEST_EQ(virtdev_set, 0, " virtual dev mode off"); @@ -1319,7 +1328,7 @@ static void VbBootRecTest(void) MockGpioAfter(10, GPIO_SHUTDOWN); mock_keypress[0] = VB_KEY_CTRL('D'); vbtlk_expect_removable = 1; - TEST_EQ(VbBootRecovery(ctx), + TEST_EQ(VbBootRecoveryLegacyClamshell(ctx), VBERROR_SHUTDOWN_REQUESTED, "Ctrl+D ignored if recovery not manually triggered"); TEST_EQ(virtdev_set, 0, " virtual dev mode off"); @@ -1337,7 +1346,7 @@ static void VbBootRecTest(void) mock_gpio[1].gpio_flags = GPIO_PRESENCE | GPIO_SHUTDOWN; mock_gpio[1].count = 100; vbtlk_expect_removable = 1; - TEST_EQ(VbBootRecovery(ctx), + TEST_EQ(VbBootRecoveryLegacyClamshell(ctx), VBERROR_SHUTDOWN_REQUESTED, "Ctrl+D ignored if phys pres button is still pressed"); TEST_NEQ(screens_displayed[1], VB_SCREEN_RECOVERY_TO_DEV, @@ -1352,7 +1361,7 @@ static void VbBootRecTest(void) mock_keypress[0] = VB_KEY_CTRL('D'); mock_keypress[1] = ' '; vbtlk_expect_removable = 1; - TEST_EQ(VbBootRecovery(ctx), + TEST_EQ(VbBootRecoveryLegacyClamshell(ctx), VBERROR_SHUTDOWN_REQUESTED, "Ctrl+D todev abort"); TEST_EQ(screens_displayed[0], VB_SCREEN_RECOVERY_INSERT, @@ -1373,7 +1382,8 @@ static void VbBootRecTest(void) mock_keypress[1] = VB_KEY_ENTER; mock_keyflags[1] = VB_KEY_FLAG_TRUSTED_KEYBOARD; vbtlk_expect_removable = 1; - TEST_EQ(VbBootRecovery(ctx), VBERROR_EC_REBOOT_TO_RO_REQUIRED, + TEST_EQ(VbBootRecoveryLegacyClamshell(ctx), + VBERROR_EC_REBOOT_TO_RO_REQUIRED, "Ctrl+D todev confirm via enter"); TEST_EQ(virtdev_set, 1, " virtual dev mode on"); @@ -1470,7 +1480,7 @@ static void VbBootRecTest(void) mock_keyflags[1] = VB_KEY_FLAG_TRUSTED_KEYBOARD; virtdev_retval = VB2_ERROR_MOCK; vbtlk_expect_removable = 1; - TEST_EQ(VbBootRecovery(ctx), + TEST_EQ(VbBootRecoveryLegacyClamshell(ctx), VBERROR_TPM_SET_BOOT_MODE_STATE, "Ctrl+D todev failure"); @@ -1485,10 +1495,12 @@ static void VbBootRecTest(void) "todiag is zero"); vbtlk_expect_removable = 1; if (DIAGNOSTIC_UI) - TEST_EQ(VbBootRecovery(ctx), VBERROR_REBOOT_REQUIRED, + TEST_EQ(VbBootRecoveryLegacyClamshell(ctx), + VBERROR_REBOOT_REQUIRED, "Ctrl+C todiag - enabled"); else - TEST_EQ(VbBootRecovery(ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootRecoveryLegacyClamshell(ctx), + VBERROR_SHUTDOWN_REQUESTED, "Ctrl+C todiag - disabled"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_DIAG_REQUEST), DIAGNOSTIC_UI, " todiag is updated for Ctrl-C"); @@ -1509,10 +1521,12 @@ static void VbBootRecTest(void) "todiag is zero"); vbtlk_expect_removable = 1; if (DIAGNOSTIC_UI) - TEST_EQ(VbBootRecovery(ctx), VBERROR_REBOOT_REQUIRED, + TEST_EQ(VbBootRecoveryLegacyClamshell(ctx), + VBERROR_REBOOT_REQUIRED, "F12 todiag - enabled"); else - TEST_EQ(VbBootRecovery(ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootRecoveryLegacyClamshell(ctx), + VBERROR_SHUTDOWN_REQUESTED, "F12 todiag - disabled"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_DIAG_REQUEST), DIAGNOSTIC_UI, " todiag is updated for F12"); @@ -1528,10 +1542,12 @@ static void VbBootRecTest(void) TEST_EQ(vb2_nv_get(ctx, VB2_NV_DIAG_REQUEST), 0, "todiag is zero"); if (DIAGNOSTIC_UI) - TEST_EQ(VbBootRecovery(ctx), VBERROR_REBOOT_REQUIRED, + TEST_EQ(VbBootRecoveryLegacyClamshell(ctx), + VBERROR_REBOOT_REQUIRED, "Ctrl+C todiag os broken - enabled"); else - TEST_EQ(VbBootRecovery(ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootRecoveryLegacyClamshell(ctx), + VBERROR_SHUTDOWN_REQUESTED, "Ctrl+C todiag os broken - disabled"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_DIAG_REQUEST), DIAGNOSTIC_UI, " todiag is updated for Ctrl-C"); @@ -1545,11 +1561,12 @@ static void VbBootRecTest(void) static void VbBootDiagTest(void) { - VB2_DEBUG("Testing VbBootDiagnostic()...\n"); + VB2_DEBUG("Testing VbBootDiagnosticLegacyClamshell()...\n"); /* No key pressed - timeout. */ ResetMocks(); - TEST_EQ(VbBootDiagnostic(ctx), VBERROR_REBOOT_REQUIRED, "Timeout"); + TEST_EQ(VbBootDiagnosticLegacyClamshell(ctx), VBERROR_REBOOT_REQUIRED, + "Timeout"); TEST_EQ(screens_displayed[0], VB_SCREEN_CONFIRM_DIAG, " confirm screen"); TEST_EQ(screens_displayed[1], VB_SCREEN_BLANK, @@ -1562,7 +1579,8 @@ static void VbBootDiagTest(void) /* Esc key pressed. */ ResetMocks(); mock_keypress[0] = VB_KEY_ESC; - TEST_EQ(VbBootDiagnostic(ctx), VBERROR_REBOOT_REQUIRED, "Esc key"); + TEST_EQ(VbBootDiagnosticLegacyClamshell(ctx), VBERROR_REBOOT_REQUIRED, + "Esc key"); TEST_EQ(screens_displayed[0], VB_SCREEN_CONFIRM_DIAG, " confirm screen"); TEST_EQ(screens_displayed[1], VB_SCREEN_BLANK, @@ -1574,7 +1592,8 @@ static void VbBootDiagTest(void) /* Shutdown requested via lid close */ ResetMocks(); MockGpioAfter(10, GPIO_LID_CLOSED); - TEST_EQ(VbBootDiagnostic(ctx), VBERROR_SHUTDOWN_REQUESTED, "Shutdown"); + TEST_EQ(VbBootDiagnosticLegacyClamshell(ctx), + VBERROR_SHUTDOWN_REQUESTED, "Shutdown"); TEST_EQ(screens_displayed[0], VB_SCREEN_CONFIRM_DIAG, " confirm screen"); TEST_EQ(screens_displayed[1], VB_SCREEN_BLANK, @@ -1587,7 +1606,8 @@ static void VbBootDiagTest(void) ResetMocks(); mock_gpio[0].gpio_flags = GPIO_PRESENCE; mock_gpio[0].count = ~0; - TEST_EQ(VbBootDiagnostic(ctx), VBERROR_REBOOT_REQUIRED, "Power held"); + TEST_EQ(VbBootDiagnosticLegacyClamshell(ctx), VBERROR_REBOOT_REQUIRED, + "Power held"); TEST_EQ(screens_displayed[0], VB_SCREEN_CONFIRM_DIAG, " confirm screen"); TEST_EQ(screens_displayed[1], VB_SCREEN_BLANK, @@ -1598,7 +1618,8 @@ static void VbBootDiagTest(void) /* Power button is pressed and released. */ ResetMocks(); MockGpioAfter(3, GPIO_PRESENCE); - TEST_EQ(VbBootDiagnostic(ctx), VBERROR_REBOOT_REQUIRED, "Confirm"); + TEST_EQ(VbBootDiagnosticLegacyClamshell(ctx), VBERROR_REBOOT_REQUIRED, + "Confirm"); TEST_EQ(screens_displayed[0], VB_SCREEN_CONFIRM_DIAG, " confirm screen"); TEST_EQ(screens_displayed[1], VB_SCREEN_BLANK, @@ -1622,7 +1643,7 @@ static void VbBootDiagTest(void) mock_gpio[0].count = 2; mock_gpio[1].gpio_flags = GPIO_PRESENCE; mock_gpio[1].count = 2; - TEST_EQ(VbBootDiagnostic(ctx), VBERROR_REBOOT_REQUIRED, + TEST_EQ(VbBootDiagnosticLegacyClamshell(ctx), VBERROR_REBOOT_REQUIRED, "Confirm but tpm fail"); TEST_EQ(screens_displayed[0], VB_SCREEN_CONFIRM_DIAG, " confirm screen"); diff --git a/tests/vboot_detach_menu_tests.c b/tests/vboot_legacy_menu_tests.c index 8f839e9d..dfcaaedd 100644 --- a/tests/vboot_detach_menu_tests.c +++ b/tests/vboot_legacy_menu_tests.c @@ -2,7 +2,7 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * - * Tests detachable menu UI + * Tests legacy menu UI */ #include "2common.h" @@ -20,7 +20,7 @@ #include "vboot_kernel.h" #include "vboot_struct.h" #include "vboot_test.h" -#include "vboot_ui_menu_private.h" +#include "vboot_ui_legacy_menu_private.h" /* Mock data */ static uint8_t shared_data[VB_SHARED_DATA_MIN_SIZE]; @@ -257,18 +257,18 @@ vb2_error_t vb2_enable_developer_mode(struct vb2_context *c) /* Tests */ /* - * VbBootNormal tests: Please see VbBootTest in vboot_api_kernel2_tests.c + * VbBootNormal tests: Please see VbBootTest in vboot_legacy_clamshell_tests.c */ static void VbBootDevTest(void) { int i; - printf("Testing VbBootDeveloperMenu()...\n"); + printf("Testing VbBootDeveloperLegacyMenu()...\n"); /* Proceed after timeout */ ResetMocksForDeveloper(); - TEST_EQ(VbBootDeveloperMenu(ctx), vbtlk_retval_fixed, "Timeout"); + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), vbtlk_retval_fixed, "Timeout"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU, " warning screen"); TEST_EQ(screens_displayed[1], VB_SCREEN_BLANK, " final blank screen"); @@ -283,7 +283,7 @@ static void VbBootDevTest(void) ResetMocksForDeveloper(); gbb.flags |= VB2_GBB_FLAG_DEFAULT_DEV_BOOT_LEGACY | VB2_GBB_FLAG_FORCE_DEV_BOOT_LEGACY; - TEST_EQ(VbBootDeveloperMenu(ctx), vbtlk_retval_fixed, + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), vbtlk_retval_fixed, "default legacy GBB"); TEST_EQ(vbexlegacy_called, 1, " try legacy"); TEST_EQ(altfw_num, 0, " check altfw_num"); @@ -303,7 +303,7 @@ static void VbBootDevTest(void) ResetMocksForDeveloper(); vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_LEGACY); vb2_nv_set(ctx, VB2_NV_DEV_BOOT_LEGACY, 1); - TEST_EQ(VbBootDeveloperMenu(ctx), vbtlk_retval_fixed, + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), vbtlk_retval_fixed, "default legacy NV"); TEST_EQ(vbexlegacy_called, 1, " try legacy"); TEST_EQ(altfw_num, 0, " check altfw_num"); @@ -321,7 +321,7 @@ static void VbBootDevTest(void) /* Proceed to legacy boot mode only if enabled */ ResetMocksForDeveloper(); vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_LEGACY); - TEST_EQ(VbBootDeveloperMenu(ctx), vbtlk_retval_fixed, + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), vbtlk_retval_fixed, "default legacy not enabled"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); @@ -343,7 +343,7 @@ static void VbBootDevTest(void) vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_USB); vb2_nv_set(ctx, VB2_NV_DEV_BOOT_USB, 1); vbtlk_retval[0] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE; - TEST_EQ(VbBootDeveloperMenu(ctx), 0, "Ctrl+U USB"); + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), 0, "Ctrl+U USB"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU, " warning screen"); TEST_EQ(screens_displayed[1], VB_SCREEN_BLANK, " final blank screen"); @@ -354,7 +354,7 @@ static void VbBootDevTest(void) /* Proceed to usb boot mode only if enabled */ ResetMocksForDeveloper(); vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_USB); - TEST_EQ(VbBootDeveloperMenu(ctx), vbtlk_retval_fixed, + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), vbtlk_retval_fixed, "default USB not enabled"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU, @@ -373,7 +373,7 @@ static void VbBootDevTest(void) ResetMocksForDeveloper(); vb2_nv_set(ctx, VB2_NV_DEV_BOOT_USB, 1); vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_USB); - TEST_EQ(VbBootDeveloperMenu(ctx), vbtlk_retval_fixed, + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), vbtlk_retval_fixed, "default USB with no disk"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); @@ -391,7 +391,7 @@ static void VbBootDevTest(void) /* Shutdown requested in loop */ ResetMocksForDeveloper(); shutdown_request_calls_left = 2; - TEST_EQ(VbBootDeveloperMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, "Shutdown requested"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); @@ -408,7 +408,7 @@ static void VbBootDevTest(void) */ ResetMocksForDeveloper(); mock_keypress[0] = VB_BUTTON_POWER_SHORT_PRESS; - TEST_EQ(VbBootDeveloperMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, "dev warning menu: default to power off"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU, @@ -428,7 +428,7 @@ static void VbBootDevTest(void) mock_keypress[i++] = VB_BUTTON_VOL_DOWN_SHORT_PRESS; // Cancel mock_keypress[i++] = VB_BUTTON_VOL_DOWN_SHORT_PRESS; // Power Off mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; - TEST_EQ(VbBootDeveloperMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, "Power Off in DEVELOPER"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); @@ -456,7 +456,7 @@ static void VbBootDevTest(void) /* Pressing ENTER is equivalent to power button. */ ResetMocksForDeveloper(); mock_keypress[0] = VB_KEY_ENTER; - TEST_EQ(VbBootDeveloperMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, "dev warning menu: ENTER is power button"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU, " warning screen"); @@ -469,7 +469,7 @@ static void VbBootDevTest(void) ResetMocksForDeveloper(); gbb.flags |= VB2_GBB_FLAG_ENTER_TRIGGERS_TONORM; mock_keypress[0] = VB_KEY_ENTER; - TEST_EQ(VbBootDeveloperMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, "dev warning menu: ENTER unaffected by GBB"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU, " warning screen"); @@ -483,7 +483,7 @@ static void VbBootDevTest(void) mock_keypress[0] = ' '; mock_keypress[1] = VB_BUTTON_VOL_UP_DOWN_COMBO_PRESS; mock_keypress[2] = VB_BUTTON_POWER_SHORT_PRESS; // select Power Off - TEST_EQ(VbBootDeveloperMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, "SPACE or VolUp+Down have no effect"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); @@ -500,7 +500,7 @@ static void VbBootDevTest(void) mock_keypress[0] = VB_BUTTON_VOL_UP_SHORT_PRESS; mock_keypress[1] = VB_BUTTON_POWER_SHORT_PRESS; mock_keypress[2] = VB_BUTTON_POWER_SHORT_PRESS; - TEST_EQ(VbBootDeveloperMenu(ctx), VBERROR_REBOOT_REQUIRED, + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VBERROR_REBOOT_REQUIRED, "disable developer mode"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU, @@ -526,7 +526,7 @@ static void VbBootDevTest(void) mock_keypress[0] = VB_BUTTON_VOL_UP_SHORT_PRESS; mock_keypress[1] = VB_BUTTON_POWER_SHORT_PRESS; mock_keypress[2] = VB_BUTTON_POWER_SHORT_PRESS; - TEST_EQ(VbBootDeveloperMenu(ctx), vbtlk_retval_fixed, + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), vbtlk_retval_fixed, "Can't tonorm gbb-dev"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU, @@ -552,7 +552,7 @@ static void VbBootDevTest(void) mock_keypress[0] = VB_BUTTON_VOL_UP_SHORT_PRESS; mock_keypress[1] = VB_BUTTON_POWER_SHORT_PRESS; shutdown_request_calls_left = 2; - TEST_EQ(VbBootDeveloperMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, "Shutdown requested at tonorm"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU, @@ -568,7 +568,7 @@ static void VbBootDevTest(void) /* Ctrl+D dismisses warning */ ResetMocksForDeveloper(); mock_keypress[0] = VB_KEY_CTRL('D'); - TEST_EQ(VbBootDeveloperMenu(ctx), vbtlk_retval_fixed, "Ctrl+D"); + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), vbtlk_retval_fixed, "Ctrl+D"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " recovery reason"); TEST_NEQ(audio_looping_calls_left, 0, " aborts audio"); @@ -584,13 +584,13 @@ static void VbBootDevTest(void) ResetMocksForDeveloper(); mock_keypress[0] = VB_KEY_CTRL('D'); gbb.flags |= VB2_GBB_FLAG_DEFAULT_DEV_BOOT_LEGACY; - TEST_EQ(VbBootDeveloperMenu(ctx), vbtlk_retval_fixed, "Ctrl+D"); + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), vbtlk_retval_fixed, "Ctrl+D"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); /* Volume-down long press shortcut acts like Ctrl+D */ ResetMocksForDeveloper(); mock_keypress[0] = VB_BUTTON_VOL_DOWN_LONG_PRESS; - TEST_EQ(VbBootDeveloperMenu(ctx), vbtlk_retval_fixed, + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), vbtlk_retval_fixed, "VolDown long press"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " recovery reason"); @@ -605,7 +605,8 @@ static void VbBootDevTest(void) /* Ctrl+L tries legacy boot mode only if enabled */ ResetMocksForDeveloper(); mock_keypress[0] = VB_KEY_CTRL('L'); - TEST_EQ(VbBootDeveloperMenu(ctx), vbtlk_retval_fixed, "Ctrl+L normal"); + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), vbtlk_retval_fixed, + "Ctrl+L normal"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); @@ -626,7 +627,7 @@ static void VbBootDevTest(void) gbb.flags |= VB2_GBB_FLAG_FORCE_DEV_BOOT_LEGACY; mock_keypress[0] = VB_KEY_CTRL('L'); mock_keypress[1] = VB_BUTTON_POWER_SHORT_PRESS; - TEST_EQ(VbBootDeveloperMenu(ctx), vbtlk_retval_fixed, + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), vbtlk_retval_fixed, "Ctrl+L force legacy"); TEST_EQ(vbexlegacy_called, 1, " try legacy"); TEST_EQ(altfw_num, 1, " check altfw_num"); @@ -645,7 +646,7 @@ static void VbBootDevTest(void) vb2_nv_set(ctx, VB2_NV_DEV_BOOT_LEGACY, 1); mock_keypress[0] = VB_KEY_CTRL('L'); mock_keypress[1] = VB_BUTTON_POWER_SHORT_PRESS; - TEST_EQ(VbBootDeveloperMenu(ctx), vbtlk_retval_fixed, + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), vbtlk_retval_fixed, "Ctrl+L nv legacy"); TEST_EQ(vbexlegacy_called, 1, " try legacy"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); @@ -664,7 +665,7 @@ static void VbBootDevTest(void) fwmp->flags |= VB2_SECDATA_FWMP_DEV_ENABLE_LEGACY; mock_keypress[0] = VB_KEY_CTRL('L'); mock_keypress[1] = VB_BUTTON_POWER_SHORT_PRESS; - TEST_EQ(VbBootDeveloperMenu(ctx), vbtlk_retval_fixed, + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), vbtlk_retval_fixed, "Ctrl+L fwmp legacy"); TEST_EQ(vbexlegacy_called, 1, " fwmp legacy"); TEST_EQ(altfw_num, 1, " check altfw_num"); @@ -683,7 +684,7 @@ static void VbBootDevTest(void) /* Ctrl+U boots USB only if enabled */ ResetMocksForDeveloper(); mock_keypress[0] = VB_KEY_CTRL('U'); - TEST_EQ(VbBootDeveloperMenu(ctx), vbtlk_retval_fixed, + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), vbtlk_retval_fixed, "Ctrl+U not enabled"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); TEST_EQ(debug_info_displayed, 0, " no debug info"); @@ -705,7 +706,7 @@ static void VbBootDevTest(void) vb2_nv_set(ctx, VB2_NV_DEV_BOOT_USB, 1); mock_keypress[0] = VB_KEY_CTRL('U'); vbtlk_retval[0] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE; - TEST_EQ(VbBootDeveloperMenu(ctx), VB2_SUCCESS, "Ctrl+U USB"); + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VB2_SUCCESS, "Ctrl+U USB"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); @@ -720,7 +721,7 @@ static void VbBootDevTest(void) ResetMocksForDeveloper(); vb2_nv_set(ctx, VB2_NV_DEV_BOOT_USB, 1); mock_keypress[0] = VB_KEY_CTRL('U'); - TEST_EQ(VbBootDeveloperMenu(ctx), vbtlk_retval_fixed, + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), vbtlk_retval_fixed, "Ctrl+U without valid USB"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); @@ -741,7 +742,8 @@ static void VbBootDevTest(void) gbb.flags |= VB2_GBB_FLAG_FORCE_DEV_BOOT_USB; mock_keypress[0] = VB_KEY_CTRL('U'); vbtlk_retval[0] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE; - TEST_EQ(VbBootDeveloperMenu(ctx), VB2_SUCCESS, "Ctrl+U force USB"); + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VB2_SUCCESS, + "Ctrl+U force USB"); TEST_NEQ(audio_looping_calls_left, 0, " aborts audio"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU, " warning screen"); @@ -754,7 +756,8 @@ static void VbBootDevTest(void) fwmp->flags |= VB2_SECDATA_FWMP_DEV_ENABLE_USB; mock_keypress[0] = VB_KEY_CTRL('U'); vbtlk_retval[0] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE; - TEST_EQ(VbBootDeveloperMenu(ctx), VB2_SUCCESS, "Ctrl+U force USB"); + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VB2_SUCCESS, + "Ctrl+U force USB"); TEST_NEQ(audio_looping_calls_left, 0, " aborts audio"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU, " warning screen"); @@ -766,7 +769,7 @@ static void VbBootDevTest(void) ResetMocksForDeveloper(); vb2_nv_set(ctx, VB2_NV_DEV_BOOT_USB, 1); mock_keypress[0] = VB_KEY_CTRL('U'); - TEST_EQ(VbBootDeveloperMenu(ctx), vbtlk_retval_fixed, + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), vbtlk_retval_fixed, "Ctrl+U failed - no USB"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); @@ -792,7 +795,7 @@ static void VbBootDevTest(void) mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; vb2_nv_set(ctx, VB2_NV_DEV_BOOT_USB, 1); vbtlk_retval[0] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE; - TEST_EQ(VbBootDeveloperMenu(ctx), VB2_SUCCESS, + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VB2_SUCCESS, "Menu selected USB boot"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); @@ -826,7 +829,7 @@ static void VbBootDevTest(void) mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; vb2_nv_set(ctx, VB2_NV_DEV_BOOT_USB, 1); vbtlk_retval[0] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE; - TEST_EQ(VbBootDeveloperMenu(ctx), VB2_SUCCESS, + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VB2_SUCCESS, "Menu selected USB default boot"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); TEST_NEQ(audio_looping_calls_left, 0, " aborts audio"); @@ -856,7 +859,7 @@ static void VbBootDevTest(void) mock_keypress[i++] = VB_BUTTON_VOL_UP_SHORT_PRESS; // Boot From USB mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; vb2_nv_set(ctx, VB2_NV_DEV_BOOT_USB, 1); - TEST_EQ(VbBootDeveloperMenu(ctx), vbtlk_retval_fixed, + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), vbtlk_retval_fixed, "Menu selected invalid USB boot"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); TEST_EQ(audio_looping_calls_left, 0, " used up audio"); @@ -891,7 +894,7 @@ static void VbBootDevTest(void) mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; mock_keypress[i++] = VB_BUTTON_VOL_UP_SHORT_PRESS; // Boot From USB mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; - TEST_EQ(VbBootDeveloperMenu(ctx), vbtlk_retval_fixed, + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), vbtlk_retval_fixed, "Menu selected disabled USB boot"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); TEST_EQ(audio_looping_calls_left, 0, " used up audio"); @@ -929,7 +932,7 @@ static void VbBootDevTest(void) mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; // and again vb2_nv_set(ctx, VB2_NV_DEV_BOOT_LEGACY, 1); vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_LEGACY); - TEST_EQ(VbBootDeveloperMenu(ctx), vbtlk_retval_fixed, + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), vbtlk_retval_fixed, "Menu selected legacy boot"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_EQ(vbexlegacy_called, 2, " tried legacy boot twice"); @@ -968,7 +971,7 @@ static void VbBootDevTest(void) mock_keypress[i++] = VB_BUTTON_VOL_UP_SHORT_PRESS; // Boot From USB mock_keypress[i++] = VB_BUTTON_VOL_UP_SHORT_PRESS; // Boot Legacy BIOS mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; - TEST_EQ(VbBootDeveloperMenu(ctx), vbtlk_retval_fixed, + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), vbtlk_retval_fixed, "Menu selected legacy boot when not enabled"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_EQ(vbexlegacy_called, 0, " did not attempt legacy boot"); @@ -1003,7 +1006,7 @@ static void VbBootDevTest(void) vb2_nv_set(ctx, VB2_NV_DEV_BOOT_USB, 1); mock_keypress[0] = VB_BUTTON_VOL_UP_LONG_PRESS; vbtlk_retval[0] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE; - TEST_EQ(VbBootDeveloperMenu(ctx), VB2_SUCCESS, "VolUp USB"); + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VB2_SUCCESS, "VolUp USB"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_NEQ(audio_looping_calls_left, 0, " aborts audio"); @@ -1020,7 +1023,7 @@ static void VbBootDevTest(void) mock_keypress[1] = VB_BUTTON_VOL_UP_LONG_PRESS; vbtlk_retval[0] = VB2_ERROR_MOCK - VB_DISK_FLAG_REMOVABLE; vbtlk_retval[1] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE; - TEST_EQ(VbBootDeveloperMenu(ctx), VB2_SUCCESS, + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VB2_SUCCESS, "VolUp USB valid after invalid"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); @@ -1038,7 +1041,7 @@ static void VbBootDevTest(void) /* Volume-up long press only works if USB is enabled */ ResetMocksForDeveloper(); mock_keypress[0] = VB_BUTTON_VOL_UP_LONG_PRESS; - TEST_EQ(VbBootDeveloperMenu(ctx), vbtlk_retval_fixed, + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), vbtlk_retval_fixed, "VolUp not enabled"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); @@ -1058,7 +1061,7 @@ static void VbBootDevTest(void) ResetMocksForDeveloper(); vb2_nv_set(ctx, VB2_NV_DEV_BOOT_USB, 1); mock_keypress[0] = VB_BUTTON_VOL_UP_LONG_PRESS; - TEST_EQ(VbBootDeveloperMenu(ctx), vbtlk_retval_fixed, + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), vbtlk_retval_fixed, "VolUp without valid USB"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); @@ -1087,7 +1090,7 @@ static void VbBootDevTest(void) mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; mock_keypress[i++] = VB_BUTTON_VOL_UP_LONG_PRESS; vbtlk_retval[0] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE; - TEST_EQ(VbBootDeveloperMenu(ctx), VB2_SUCCESS, + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VB2_SUCCESS, "VolUp USB from LANGUAGE"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); @@ -1121,7 +1124,7 @@ static void VbBootDevTest(void) mock_keypress[i++] = VB_BUTTON_VOL_UP_SHORT_PRESS; // enable os verification mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; // confirm is the default - TEST_EQ(VbBootDeveloperMenu(ctx), VBERROR_REBOOT_REQUIRED, + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VBERROR_REBOOT_REQUIRED, "TONORM via menu"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_DISABLE_DEV_REQUEST), 1, " disable dev request"); @@ -1154,7 +1157,7 @@ static void VbBootDevTest(void) mock_keypress[i++] = VB_BUTTON_VOL_DOWN_LONG_PRESS; /* same */ mock_keypress[i++] = VB_BUTTON_VOL_UP_DOWN_COMBO_PRESS; /* noop */ mock_keypress[i++] = VB_KEY_ENTER; - TEST_EQ(VbBootDeveloperMenu(ctx), VBERROR_REBOOT_REQUIRED, + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VBERROR_REBOOT_REQUIRED, "FWMP dev disabled"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_DISABLE_DEV_REQUEST), 1, " disable dev request"); @@ -1200,7 +1203,7 @@ static void VbBootDevTest(void) ResetMocksForDeveloper(); fwmp->flags |= VB2_SECDATA_FWMP_DEV_DISABLE_BOOT; shutdown_request_calls_left = 1; - TEST_EQ(VbBootDeveloperMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, "Shutdown requested when dev disabled"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_DISABLE_DEV_REQUEST), 0, @@ -1218,7 +1221,7 @@ static void VbBootDevTest(void) i = 0; mock_keypress[i++] = VB_BUTTON_VOL_DOWN_SHORT_PRESS; // Power Off mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; - TEST_EQ(VbBootDeveloperMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, "Power Off when dev disabled"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_DISABLE_DEV_REQUEST), 0, @@ -1241,7 +1244,7 @@ static void VbBootDevTest(void) mock_keypress[i++] = VB_BUTTON_VOL_UP_SHORT_PRESS; // Enable OS Verif mock_keypress[i++] = VB_BUTTON_VOL_UP_SHORT_PRESS; // Show Debug Info mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; - TEST_EQ(VbBootDeveloperMenu(ctx), vbtlk_retval_fixed, + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), vbtlk_retval_fixed, "Show Debug Info"); TEST_EQ(debug_info_displayed, 1, " debug info displayed"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); @@ -1262,7 +1265,7 @@ static void VbBootDevTest(void) ResetMocksForDeveloper(); i = 0; mock_keypress[i++] = '\t'; - TEST_EQ(VbBootDeveloperMenu(ctx), vbtlk_retval_fixed, + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), vbtlk_retval_fixed, "Show Debug Info (Tab shortcut)"); TEST_EQ(debug_info_displayed, 1, " debug info displayed"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); @@ -1283,11 +1286,11 @@ static void VbBootRecTest(void) { int i; - printf("Testing VbBootRecoveryMenu()...\n"); + printf("Testing VbBootRecoveryLegacyMenu()...\n"); /* Shutdown requested in BROKEN */ ResetMocks(); - TEST_EQ(VbBootRecoveryMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, "Shutdown requested in BROKEN"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); @@ -1305,7 +1308,7 @@ static void VbBootRecTest(void) vbtlk_retval[2] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE; vbtlk_retval[3] = VB2_ERROR_LK_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; - TEST_EQ(VbBootRecoveryMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, "Shutdown requested in BROKEN with disks"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); @@ -1320,7 +1323,7 @@ static void VbBootRecTest(void) vbtlk_retval[0] = VB2_ERROR_LK_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; vbtlk_retval[1] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE; - TEST_EQ(VbBootRecoveryMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, "Shutdown requested in BROKEN with later disk"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); @@ -1337,7 +1340,7 @@ static void VbBootRecTest(void) VB_DISK_FLAG_REMOVABLE; vbtlk_retval[2] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE; sd->flags |= VB2_SD_FLAG_DEV_MODE_ENABLED; - TEST_EQ(VbBootRecoveryMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, "Shutdown requested in BROKEN with dev switch"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); @@ -1351,7 +1354,7 @@ static void VbBootRecTest(void) ResetMocksForManualRecovery(); vbtlk_retval[0] = VB2_ERROR_LK_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; - TEST_EQ(VbBootRecoveryMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, "Shutdown requested in INSERT with manual rec"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); @@ -1366,7 +1369,7 @@ static void VbBootRecTest(void) vbtlk_retval[0] = VB2_ERROR_LK_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; gbb.flags |= VB2_GBB_FLAG_FORCE_MANUAL_RECOVERY; - TEST_EQ(VbBootRecoveryMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, "Shutdown requested in INSERT forced by GBB flag"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); @@ -1381,7 +1384,7 @@ static void VbBootRecTest(void) vbtlk_retval[0] = VB2_ERROR_LK_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; sd->flags &= ~VB2_SD_FLAG_MANUAL_RECOVERY; - TEST_EQ(VbBootRecoveryMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, "Go to BROKEN if recovery not manually requested"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); @@ -1396,7 +1399,7 @@ static void VbBootRecTest(void) vbtlk_retval[0] = VB2_ERROR_LK_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; trust_ec = 0; - TEST_EQ(VbBootRecoveryMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, "Go to BROKEN if EC is not trusted"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); @@ -1410,7 +1413,7 @@ static void VbBootRecTest(void) ResetMocksForManualRecovery(); vbtlk_retval[0] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE; vbtlk_retval[1] = VB2_ERROR_MOCK - VB_DISK_FLAG_REMOVABLE; - TEST_EQ(VbBootRecoveryMenu(ctx), VB2_SUCCESS, + TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VB2_SUCCESS, "INSERT boots without screens if valid on first try"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); @@ -1430,7 +1433,7 @@ static void VbBootRecTest(void) vbtlk_retval[3] = VB2_ERROR_LK_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; vbtlk_retval[4] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE; - TEST_EQ(VbBootRecoveryMenu(ctx), VB2_SUCCESS, + TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VB2_SUCCESS, "INSERT boots after valid image appears"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); @@ -1451,7 +1454,7 @@ static void VbBootRecTest(void) vbtlk_retval[3] = VB2_ERROR_LK_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; vbtlk_retval[4] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE; - TEST_EQ(VbBootRecoveryMenu(ctx), VB2_SUCCESS, + TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VB2_SUCCESS, "INSERT boots after valid image appears"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); @@ -1480,7 +1483,7 @@ static void VbBootRecTest(void) mock_keypress[i] = VB_KEY_FLAG_TRUSTED_KEYBOARD; mock_keypress[i++] = VB_BUTTON_VOL_DOWN_LONG_PRESS; mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; - TEST_EQ(VbBootRecoveryMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, "Shortcuts ignored in BROKEN"); TEST_EQ(virtdev_set, 0, " virtual dev mode off"); TEST_NEQ(shutdown_request_calls_left, 0, " powered down explicitly"); @@ -1508,7 +1511,7 @@ static void VbBootRecTest(void) mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; vbtlk_retval[0] = VB2_ERROR_LK_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; - TEST_EQ(VbBootRecoveryMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, "Shortcuts ignored in INSERT"); TEST_EQ(virtdev_set, 0, " virtual dev mode off"); TEST_NEQ(shutdown_request_calls_left, 0, " powered down explicitly"); @@ -1525,7 +1528,7 @@ static void VbBootRecTest(void) mock_keypress[0] = VB_BUTTON_VOL_UP_SHORT_PRESS; // enter options mock_keypress[1] = VB_BUTTON_VOL_DOWN_SHORT_PRESS; // power off mock_keypress[2] = VB_BUTTON_POWER_SHORT_PRESS; - TEST_EQ(VbBootRecoveryMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, "Power Off BROKEN through OPTIONS"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); @@ -1545,7 +1548,7 @@ static void VbBootRecTest(void) mock_keypress[0] = VB_BUTTON_VOL_UP_SHORT_PRESS; // enter options mock_keypress[1] = VB_BUTTON_VOL_DOWN_SHORT_PRESS; // power off mock_keypress[2] = VB_BUTTON_POWER_SHORT_PRESS; - TEST_EQ(VbBootRecoveryMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, "Power Off NOGOOD through OPTIONS"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); @@ -1569,7 +1572,7 @@ static void VbBootRecTest(void) mock_keypress[2] = VB_BUTTON_POWER_SHORT_PRESS; vbtlk_retval[0] = VB2_ERROR_LK_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; - TEST_EQ(VbBootRecoveryMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, "Power Off INSERT through TO_DEV"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); @@ -1589,7 +1592,7 @@ static void VbBootRecTest(void) mock_keypress[0] = VB_BUTTON_VOL_UP_SHORT_PRESS; // enter options mock_keypress[1] = VB_BUTTON_VOL_UP_SHORT_PRESS; // show debug info mock_keypress[2] = VB_BUTTON_POWER_SHORT_PRESS; - TEST_EQ(VbBootRecoveryMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, "Show Debug info from BROKEN through OPTIONS"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 1, " no debug info"); @@ -1607,7 +1610,7 @@ static void VbBootRecTest(void) /* Show Debug Info on NOGOOD with Tab */ ResetMocksForManualRecovery(); mock_keypress[0] = '\t'; - TEST_EQ(VbBootRecoveryMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, "Show Debug info on NOGOOD with Tab"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 1, " no debug info"); @@ -1631,7 +1634,7 @@ static void VbBootRecTest(void) mock_keypress[i++] = VB_BUTTON_VOL_DOWN_SHORT_PRESS; // cancel mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; // power off - TEST_EQ(VbBootRecoveryMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, "go to TO_DEV screen and cancel"); TEST_NEQ(shutdown_request_calls_left, 0, " powered down explicitly"); TEST_EQ(virtdev_set, 0, " virtual dev mode off"); @@ -1662,7 +1665,7 @@ static void VbBootRecTest(void) mock_keyflags[i] = VB_KEY_FLAG_TRUSTED_KEYBOARD; mock_keypress[i++] = VB_BUTTON_VOL_UP_SHORT_PRESS; mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; - TEST_EQ(VbBootRecoveryMenu(ctx), VBERROR_REBOOT_REQUIRED, + TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_REBOOT_REQUIRED, "go to TO_DEV screen and confirm"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); @@ -1684,7 +1687,7 @@ static void VbBootRecTest(void) mock_keypress[i++] = VB_BUTTON_VOL_UP_DOWN_COMBO_PRESS; // try to_dev mock_keypress[i++] = VB_BUTTON_VOL_UP_SHORT_PRESS; // try confirm mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; - TEST_EQ(VbBootRecoveryMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, "Untrusted keyboard cannot enter TO_DEV"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); @@ -1707,7 +1710,7 @@ static void VbBootRecTest(void) mock_keypress[i++] = VB_BUTTON_VOL_UP_DOWN_COMBO_PRESS; // enter to_dev mock_keypress[i++] = VB_BUTTON_VOL_UP_SHORT_PRESS; // try to confirm... mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; - TEST_EQ(VbBootRecoveryMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, "Untrusted keyboard cannot navigate in TO_DEV"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); @@ -1737,7 +1740,7 @@ static void VbBootRecTest(void) mock_keypress[i++] = VB_BUTTON_VOL_UP_SHORT_PRESS; // confirm enabling mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; virtdev_retval = VB2_ERROR_MOCK; - TEST_EQ(VbBootRecoveryMenu(ctx), VBERROR_TPM_SET_BOOT_MODE_STATE, + TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_TPM_SET_BOOT_MODE_STATE, "todev TPM failure"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); @@ -1762,7 +1765,7 @@ static void VbBootRecTest(void) i = 0; mock_keyflags[i] = VB_KEY_FLAG_TRUSTED_KEYBOARD; mock_keypress[i++] = VB_BUTTON_VOL_UP_DOWN_COMBO_PRESS; // enter to_dev - TEST_EQ(VbBootRecoveryMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, "Ctrl+D ignored if already in dev mode"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); @@ -1791,7 +1794,7 @@ static void VbBootRecTest(void) vbtlk_retval[0] = VB2_ERROR_MOCK - VB_DISK_FLAG_REMOVABLE; vbtlk_retval[1] = VB2_ERROR_LK_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; - TEST_EQ(VbBootRecoveryMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, "Drop back to INSERT from TO_DEV when removing invalid USB"); TEST_NEQ(shutdown_request_calls_left, 0, " powered down explicitly"); TEST_EQ(virtdev_set, 0, " virtual dev mode off"); @@ -1826,7 +1829,7 @@ static void VbBootRecTest(void) vbtlk_retval[3] = VB2_ERROR_LK_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; vbtlk_retval[4] = VB2_ERROR_MOCK - VB_DISK_FLAG_REMOVABLE; - TEST_EQ(VbBootRecoveryMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, "Drop back to NOGOOD from LANGUAGE when inserting invalid USB"); TEST_EQ(shutdown_request_calls_left, 0, " timed out"); TEST_EQ(virtdev_set, 0, " virtual dev mode off"); @@ -1854,7 +1857,7 @@ static void VbBootRecTest(void) vbtlk_retval[0] = VB2_ERROR_LK_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; vbtlk_retval[1] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE; - TEST_EQ(VbBootRecoveryMenu(ctx), VB2_SUCCESS, + TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VB2_SUCCESS, "Boot by plugging in USB straight from OPTIONS menu"); TEST_NEQ(shutdown_request_calls_left, 0, " booted explicitly"); TEST_EQ(virtdev_set, 0, " virtual dev mode off"); @@ -1887,7 +1890,7 @@ static void VbTestLanguageMenu(void) mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; // select current lang mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; // cancel -> BROKEN mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; // power off - TEST_EQ(VbBootRecoveryMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, "go to language menu from BROKEN"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_NEQ(shutdown_request_calls_left, 0, " powered down explicitly"); @@ -1935,7 +1938,7 @@ static void VbTestLanguageMenu(void) mock_keyflags[i] = VB_KEY_FLAG_TRUSTED_KEYBOARD; mock_keypress[i++] = VB_BUTTON_VOL_DOWN_SHORT_PRESS; // power off mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; - TEST_EQ(VbBootRecoveryMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, "go to language menus from INSERT"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_NEQ(shutdown_request_calls_left, 0, " powered down explicitly"); @@ -1999,7 +2002,7 @@ static void VbTestLanguageMenu(void) mock_keypress[i++] = VB_BUTTON_VOL_DOWN_SHORT_PRESS; // cancel mock_keypress[i++] = VB_BUTTON_VOL_DOWN_SHORT_PRESS; // power off mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; - TEST_EQ(VbBootDeveloperMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, " scroll through all language menus in developer options"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_NEQ(shutdown_request_calls_left, 0, " powered down explicitly"); @@ -2119,7 +2122,7 @@ static void VbNavigationTest(void) mock_keypress[i++] = VB_BUTTON_VOL_DOWN_SHORT_PRESS; // power off mock_keypress[i++] = VB_BUTTON_VOL_DOWN_SHORT_PRESS; // language mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; - TEST_EQ(VbBootRecoveryMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, "recovery mode long navigation"); TEST_EQ(debug_info_displayed, 1, " showed debug info"); TEST_EQ(shutdown_request_calls_left, 0, " timed out"); @@ -2248,7 +2251,7 @@ static void VbNavigationTest(void) mock_keypress[i++] = VB_BUTTON_VOL_DOWN_SHORT_PRESS; // Second altfw mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; // Select 2nd altfw vb2_nv_set(ctx, VB2_NV_DEV_BOOT_LEGACY, 1); - TEST_EQ(VbBootDeveloperMenu(ctx), vbtlk_retval_fixed, + TEST_EQ(VbBootDeveloperLegacyMenu(ctx), vbtlk_retval_fixed, "developer mode long navigation"); TEST_EQ(debug_info_displayed, 1, " showed debug info"); TEST_EQ(vbexlegacy_called, 1, " tried legacy"); |