diff options
Diffstat (limited to 'tests/vboot_detach_menu_tests.c')
| -rw-r--r-- | tests/vboot_detach_menu_tests.c | 352 |
1 files changed, 175 insertions, 177 deletions
diff --git a/tests/vboot_detach_menu_tests.c b/tests/vboot_detach_menu_tests.c index 7374882c..5e040753 100644 --- a/tests/vboot_detach_menu_tests.c +++ b/tests/vboot_detach_menu_tests.c @@ -28,7 +28,7 @@ static uint8_t shared_data[VB_SHARED_DATA_MIN_SIZE]; static VbSharedDataHeader *shared = (VbSharedDataHeader *)shared_data; static LoadKernelParams lkp; static uint8_t workbuf[VB2_KERNEL_WORKBUF_RECOMMENDED_SIZE]; -static struct vb2_context ctx; +static struct vb2_context *ctx; static struct vb2_shared_data *sd; static struct vb2_gbb_header gbb; @@ -68,13 +68,11 @@ static void ResetMocks(void) memset(&lkp, 0, sizeof(lkp)); - memset(&ctx, 0, sizeof(ctx)); - ctx.workbuf = workbuf; - ctx.workbuf_size = sizeof(workbuf); - vb2_init_context(&ctx); - vb2_nv_init(&ctx); + TEST_SUCC(vb2api_init(workbuf, sizeof(workbuf), &ctx), + "vb2api_init failed"); + vb2_nv_init(ctx); - sd = vb2_get_sd(&ctx); + sd = vb2_get_sd(ctx); sd->vbsd = shared; memset(&gbb, 0, sizeof(gbb)); @@ -273,12 +271,12 @@ static void VbBootDevTest(void) /* Proceed after timeout */ ResetMocksForDeveloper(); - TEST_EQ(VbBootDeveloperMenu(&ctx), vbtlk_retval_fixed, "Timeout"); + TEST_EQ(VbBootDeveloperMenu(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"); TEST_EQ(screens_count, 2, " no extra screens"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " recovery reason"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_EQ(audio_looping_calls_left, 0, " used up audio"); @@ -288,7 +286,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(VbBootDeveloperMenu(ctx), vbtlk_retval_fixed, "default legacy GBB"); TEST_EQ(vbexlegacy_called, 1, " try legacy"); TEST_EQ(altfw_num, 0, " check altfw_num"); @@ -306,9 +304,9 @@ static void VbBootDevTest(void) /* Proceed to legacy after timeout if boot legacy and default boot * legacy are set */ 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, + 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, "default legacy NV"); TEST_EQ(vbexlegacy_called, 1, " try legacy"); TEST_EQ(altfw_num, 0, " check altfw_num"); @@ -325,11 +323,11 @@ 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, + vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_LEGACY); + TEST_EQ(VbBootDeveloperMenu(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"); + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU, " warning screen"); TEST_EQ(screens_displayed[1], VB_SCREEN_BLANK, " blank (error flash)"); @@ -345,10 +343,10 @@ static void VbBootDevTest(void) /* Proceed to usb after timeout if boot usb and default boot * usb are set */ ResetMocksForDeveloper(); - vb2_nv_set(&ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_USB); - vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_USB, 1); + 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(VbBootDeveloperMenu(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"); @@ -358,10 +356,10 @@ 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, + vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_USB); + TEST_EQ(VbBootDeveloperMenu(ctx), vbtlk_retval_fixed, "default USB not enabled"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU, " warning screen"); TEST_EQ(screens_displayed[1], VB_SCREEN_BLANK, " blank (error flash)"); @@ -376,12 +374,12 @@ static void VbBootDevTest(void) /* If no USB tries fixed disk */ 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, + 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, "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"); + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU, " warning screen"); TEST_EQ(screens_displayed[1], VB_SCREEN_BLANK, " blank (error flash)"); @@ -396,9 +394,9 @@ static void VbBootDevTest(void) /* Shutdown requested in loop */ ResetMocksForDeveloper(); shutdown_request_calls_left = 2; - TEST_EQ(VbBootDeveloperMenu(&ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootDeveloperMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, "Shutdown requested"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU, " warning screen"); @@ -413,9 +411,9 @@ static void VbBootDevTest(void) */ ResetMocksForDeveloper(); mock_keypress[0] = VB_BUTTON_POWER_SHORT_PRESS; - TEST_EQ(VbBootDeveloperMenu(&ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootDeveloperMenu(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(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU, " warning screen"); TEST_EQ(screens_displayed[1], VB_SCREEN_BLANK, " final blank screen"); @@ -433,12 +431,12 @@ 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(VbBootDeveloperMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, "Power Off in DEVELOPER"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); TEST_NEQ(audio_looping_calls_left, 0, " aborts audio"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); i = 0; TEST_EQ(screens_displayed[i++], VB_SCREEN_DEVELOPER_WARNING_MENU, " dev warning menu: power off"); @@ -461,7 +459,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(VbBootDeveloperMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, "dev warning menu: ENTER is power button"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU, " warning screen"); @@ -474,7 +472,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(VbBootDeveloperMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, "dev warning menu: ENTER unaffected by GBB"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU, " warning screen"); @@ -488,9 +486,9 @@ 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(VbBootDeveloperMenu(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(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU, " warning screen"); @@ -505,9 +503,9 @@ 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(VbBootDeveloperMenu(ctx), VBERROR_REBOOT_REQUIRED, "disable developer mode"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU, " warning screen"); TEST_EQ(screens_displayed[1], VB_SCREEN_DEVELOPER_WARNING_MENU, @@ -518,7 +516,7 @@ static void VbBootDevTest(void) " confirm screen"); TEST_EQ(screens_displayed[4], VB_SCREEN_BLANK, " final blank screen"); TEST_EQ(screens_count, 5, " no extra screens"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_DISABLE_DEV_REQUEST), 1, + TEST_EQ(vb2_nv_get(ctx, VB2_NV_DISABLE_DEV_REQUEST), 1, " disable dev request"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_NEQ(audio_looping_calls_left, 0, " aborts audio"); @@ -531,9 +529,9 @@ 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(VbBootDeveloperMenu(ctx), vbtlk_retval_fixed, "Can't tonorm gbb-dev"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU, " warning screen: power off"); TEST_EQ(screens_displayed[1], VB_SCREEN_DEVELOPER_WARNING_MENU, @@ -557,9 +555,9 @@ 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(VbBootDeveloperMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, "Shutdown requested at tonorm"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU, " developer warning screen: power off"); TEST_EQ(screens_displayed[1], VB_SCREEN_DEVELOPER_WARNING_MENU, @@ -573,8 +571,8 @@ 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(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, + TEST_EQ(VbBootDeveloperMenu(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"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); @@ -589,15 +587,15 @@ 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(VbBootDeveloperMenu(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(VbBootDeveloperMenu(ctx), vbtlk_retval_fixed, "VolDown long press"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " recovery reason"); TEST_NEQ(audio_looping_calls_left, 0, " aborts audio"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); @@ -610,9 +608,9 @@ 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(VbBootDeveloperMenu(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(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_EQ(audio_looping_calls_left, 0, " audio timed out"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU, @@ -631,7 +629,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(VbBootDeveloperMenu(ctx), vbtlk_retval_fixed, "Ctrl+L force legacy"); TEST_EQ(vbexlegacy_called, 1, " try legacy"); TEST_EQ(altfw_num, 1, " check altfw_num"); @@ -647,13 +645,13 @@ static void VbBootDevTest(void) /* Ctrl+L boots legacy if enabled by NVRAM */ ResetMocksForDeveloper(); - vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_LEGACY, 1); + 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(VbBootDeveloperMenu(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"); + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU, " warning screen"); TEST_EQ(screens_displayed[1], VB_SCREEN_ALT_FW_MENU, " altfw"); @@ -669,7 +667,7 @@ static void VbBootDevTest(void) VbApiKernelGetFwmp()->flags |= 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(VbBootDeveloperMenu(ctx), vbtlk_retval_fixed, "Ctrl+L fwmp legacy"); TEST_EQ(vbexlegacy_called, 1, " fwmp legacy"); TEST_EQ(altfw_num, 1, " check altfw_num"); @@ -688,11 +686,11 @@ 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(VbBootDeveloperMenu(ctx), vbtlk_retval_fixed, "Ctrl+U not enabled"); 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"); + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(audio_looping_calls_left, 0, " audio timed out"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU, " warning screen"); @@ -707,13 +705,13 @@ static void VbBootDevTest(void) /* Ctrl+U enabled, with good USB boot */ ResetMocksForDeveloper(); - vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_USB, 1); + 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(VbBootDeveloperMenu(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"); + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_NEQ(audio_looping_calls_left, 0, " aborts audio"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU, " warning screen"); @@ -723,12 +721,12 @@ static void VbBootDevTest(void) /* Ctrl+U enabled, without valid USB */ ResetMocksForDeveloper(); - vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_USB, 1); + 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(VbBootDeveloperMenu(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"); + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU, " warning screen"); @@ -746,7 +744,7 @@ 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(VbBootDeveloperMenu(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"); @@ -759,7 +757,7 @@ static void VbBootDevTest(void) VbApiKernelGetFwmp()->flags |= 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(VbBootDeveloperMenu(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"); @@ -769,12 +767,12 @@ static void VbBootDevTest(void) /* If no valid USB, eventually times out and tries fixed disk */ ResetMocksForDeveloper(); - vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_USB, 1); + 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(VbBootDeveloperMenu(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"); + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(audio_looping_calls_left, 0, " used up audio"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU, " warning screen"); @@ -795,14 +793,14 @@ 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; - vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_USB, 1); + 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(VbBootDeveloperMenu(ctx), VB2_SUCCESS, "Menu selected USB boot"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); TEST_NEQ(audio_looping_calls_left, 0, " aborts audio"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); i = 0; TEST_EQ(screens_displayed[i++], VB_SCREEN_DEVELOPER_WARNING_MENU, " dev warning menu: power off"); @@ -822,20 +820,20 @@ static void VbBootDevTest(void) /* If default USB, the option is preselected */ ResetMocksForDeveloper(); - vb2_nv_set(&ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_USB); + vb2_nv_set(ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_USB); i = 0; 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_VOL_UP_SHORT_PRESS; // Developer Options mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; - vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_USB, 1); + 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(VbBootDeveloperMenu(ctx), VB2_SUCCESS, "Menu selected USB default boot"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); TEST_NEQ(audio_looping_calls_left, 0, " aborts audio"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); i = 0; TEST_EQ(screens_displayed[i++], VB_SCREEN_DEVELOPER_WARNING_MENU, " dev warning menu: power off"); @@ -860,12 +858,12 @@ 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; - vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_USB, 1); - TEST_EQ(VbBootDeveloperMenu(&ctx), vbtlk_retval_fixed, + vb2_nv_set(ctx, VB2_NV_DEV_BOOT_USB, 1); + TEST_EQ(VbBootDeveloperMenu(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"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); i = 0; TEST_EQ(screens_displayed[i++], VB_SCREEN_DEVELOPER_WARNING_MENU, " dev warning menu: power off"); @@ -896,11 +894,11 @@ 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(VbBootDeveloperMenu(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"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); i = 0; TEST_EQ(screens_displayed[i++], VB_SCREEN_DEVELOPER_WARNING_MENU, " dev warning menu: power off"); @@ -932,15 +930,15 @@ static void VbBootDevTest(void) mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; // Enter altfw menu mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; // Select first option 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, + 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, "Menu selected legacy boot"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_EQ(vbexlegacy_called, 2, " tried legacy boot twice"); TEST_EQ(altfw_num, 0, " check altfw_num"); TEST_EQ(audio_looping_calls_left, 0, " audio timeout"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); i = 0; TEST_EQ(screens_displayed[i++], VB_SCREEN_DEVELOPER_WARNING_MENU, " dev warning menu: power off"); @@ -973,12 +971,12 @@ 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(VbBootDeveloperMenu(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"); TEST_EQ(audio_looping_calls_left, 0, " audio timeout"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); i = 0; TEST_EQ(screens_displayed[i++], VB_SCREEN_DEVELOPER_WARNING_MENU, " dev warning menu: power off"); @@ -1005,12 +1003,12 @@ static void VbBootDevTest(void) /* Use volume-up long press shortcut to boot USB */ ResetMocksForDeveloper(); - vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_USB, 1); + 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(VbBootDeveloperMenu(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_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_NEQ(audio_looping_calls_left, 0, " aborts audio"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU, " warning screen"); @@ -1020,15 +1018,15 @@ static void VbBootDevTest(void) /* Can boot a valid USB image after failing to boot invalid image */ ResetMocksForDeveloper(); - vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_USB, 1); + vb2_nv_set(ctx, VB2_NV_DEV_BOOT_USB, 1); mock_keypress[0] = VB_BUTTON_VOL_UP_LONG_PRESS; 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(VbBootDeveloperMenu(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"); + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_NEQ(audio_looping_calls_left, 0, " aborts audio"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU, " warning screen"); @@ -1043,10 +1041,10 @@ 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(VbBootDeveloperMenu(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"); + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(audio_looping_calls_left, 0, " audio timed out"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU, " warning screen"); @@ -1061,12 +1059,12 @@ static void VbBootDevTest(void) /* Volume-up long press without valid USB will still time out */ ResetMocksForDeveloper(); - vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_USB, 1); + 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(VbBootDeveloperMenu(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"); + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU, " warning screen"); TEST_EQ(screens_displayed[1], VB_SCREEN_BLANK, " blank (error flash)"); @@ -1080,7 +1078,7 @@ static void VbBootDevTest(void) /* Volume-up long press works from other menus, like LANGUAGE */ ResetMocksForDeveloper(); - vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_USB, 1); + vb2_nv_set(ctx, VB2_NV_DEV_BOOT_USB, 1); i = 0; mock_keypress[i++] = VB_BUTTON_VOL_UP_SHORT_PRESS; // Enable OS Verif mock_keypress[i++] = VB_BUTTON_VOL_UP_SHORT_PRESS; // Show Debug Info @@ -1092,10 +1090,10 @@ 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(VbBootDeveloperMenu(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"); + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_NEQ(audio_looping_calls_left, 0, " aborts audio"); i = 0; TEST_EQ(screens_displayed[i++], VB_SCREEN_DEVELOPER_WARNING_MENU, @@ -1126,11 +1124,11 @@ 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(VbBootDeveloperMenu(ctx), VBERROR_REBOOT_REQUIRED, "TONORM via menu"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_DISABLE_DEV_REQUEST), 1, + TEST_EQ(vb2_nv_get(ctx, VB2_NV_DISABLE_DEV_REQUEST), 1, " disable dev request"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_NEQ(audio_looping_calls_left, 0, " aborts audio"); @@ -1159,11 +1157,11 @@ 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(VbBootDeveloperMenu(ctx), VBERROR_REBOOT_REQUIRED, "FWMP dev disabled"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_DISABLE_DEV_REQUEST), 1, + TEST_EQ(vb2_nv_get(ctx, VB2_NV_DISABLE_DEV_REQUEST), 1, " disable dev request"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); TEST_NEQ(audio_looping_calls_left, 0, " aborts audio"); @@ -1205,10 +1203,10 @@ static void VbBootDevTest(void) ResetMocksForDeveloper(); VbApiKernelGetFwmp()->flags |= FWMP_DEV_DISABLE_BOOT; shutdown_request_calls_left = 1; - TEST_EQ(VbBootDeveloperMenu(&ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootDeveloperMenu(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, + 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, " did not exit dev mode"); TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_TO_NORM_MENU, " tonorm screen"); @@ -1223,10 +1221,10 @@ 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(VbBootDeveloperMenu(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, + 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, " did not exit dev mode"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_NEQ(audio_looping_calls_left, 0, " aborts audio"); @@ -1246,12 +1244,12 @@ 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(VbBootDeveloperMenu(ctx), vbtlk_retval_fixed, "Show Debug Info"); TEST_EQ(debug_info_displayed, 1, " debug info displayed"); TEST_EQ(vbexlegacy_called, 0, " not legacy"); TEST_EQ(audio_looping_calls_left, 0, " audio timed out"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); i = 0; TEST_EQ(screens_displayed[i++], VB_SCREEN_DEVELOPER_WARNING_MENU, " dev warning menu: power off"); @@ -1267,12 +1265,12 @@ static void VbBootDevTest(void) ResetMocksForDeveloper(); i = 0; mock_keypress[i++] = '\t'; - TEST_EQ(VbBootDeveloperMenu(&ctx), vbtlk_retval_fixed, + TEST_EQ(VbBootDeveloperMenu(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"); TEST_EQ(audio_looping_calls_left, 0, " audio timed out"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); i = 0; TEST_EQ(screens_displayed[i++], VB_SCREEN_DEVELOPER_WARNING_MENU, " dev warning menu: power off"); @@ -1292,9 +1290,9 @@ static void VbBootRecTest(void) /* Shutdown requested in BROKEN */ ResetMocks(); - TEST_EQ(VbBootRecoveryMenu(&ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootRecoveryMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, "Shutdown requested in BROKEN"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_EQ(screens_displayed[0], VB_SCREEN_OS_BROKEN, " broken screen"); @@ -1309,9 +1307,9 @@ static void VbBootRecTest(void) vbtlk_retval[1] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE; vbtlk_retval[2] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE; vbtlk_retval[3] = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; - TEST_EQ(VbBootRecoveryMenu(&ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootRecoveryMenu(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(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_EQ(screens_displayed[0], VB_SCREEN_OS_BROKEN, " broken screen"); @@ -1323,9 +1321,9 @@ static void VbBootRecTest(void) ResetMocks(); vbtlk_retval[0] = VBERROR_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(VbBootRecoveryMenu(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(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_EQ(screens_displayed[0], VB_SCREEN_OS_BROKEN, " broken screen"); @@ -1339,9 +1337,9 @@ static void VbBootRecTest(void) vbtlk_retval[1] = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; vbtlk_retval[2] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE; shared->flags |= VBSD_BOOT_DEV_SWITCH_ON; - TEST_EQ(VbBootRecoveryMenu(&ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootRecoveryMenu(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(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_EQ(screens_displayed[0], VB_SCREEN_OS_BROKEN, " broken screen"); @@ -1352,9 +1350,9 @@ static void VbBootRecTest(void) /* go to INSERT if recovery button physically pressed and EC trusted */ ResetMocksForManualRecovery(); vbtlk_retval[0] = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; - TEST_EQ(VbBootRecoveryMenu(&ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootRecoveryMenu(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(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_EQ(screens_displayed[0], VB_SCREEN_RECOVERY_INSERT, " insert screen"); @@ -1366,9 +1364,9 @@ static void VbBootRecTest(void) ResetMocks(); vbtlk_retval[0] = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; gbb.flags |= VB2_GBB_FLAG_FORCE_MANUAL_RECOVERY; - TEST_EQ(VbBootRecoveryMenu(&ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootRecoveryMenu(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(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_EQ(screens_displayed[0], VB_SCREEN_RECOVERY_INSERT, " insert screen"); @@ -1380,9 +1378,9 @@ static void VbBootRecTest(void) ResetMocksForManualRecovery(); vbtlk_retval[0] = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; shared->flags &= ~VBSD_BOOT_REC_SWITCH_ON; - TEST_EQ(VbBootRecoveryMenu(&ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootRecoveryMenu(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(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_EQ(screens_displayed[0], VB_SCREEN_OS_BROKEN, " broken screen"); @@ -1394,9 +1392,9 @@ static void VbBootRecTest(void) ResetMocksForManualRecovery(); vbtlk_retval[0] = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; trust_ec = 0; - TEST_EQ(VbBootRecoveryMenu(&ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootRecoveryMenu(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(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_EQ(screens_displayed[0], VB_SCREEN_OS_BROKEN, " broken screen"); @@ -1408,9 +1406,9 @@ 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(VbBootRecoveryMenu(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(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_EQ(virtdev_set, 0, " virtual dev mode off"); TEST_EQ(screens_displayed[0], VB_SCREEN_BLANK, " final blank screen"); @@ -1424,9 +1422,9 @@ static void VbBootRecTest(void) vbtlk_retval[2] = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; vbtlk_retval[3] = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; vbtlk_retval[4] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE; - TEST_EQ(VbBootRecoveryMenu(&ctx), VB2_SUCCESS, + TEST_EQ(VbBootRecoveryMenu(ctx), VB2_SUCCESS, "INSERT boots after valid image appears"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_EQ(virtdev_set, 0, " virtual dev mode off"); TEST_EQ(screens_displayed[0], VB_SCREEN_RECOVERY_INSERT, @@ -1442,9 +1440,9 @@ static void VbBootRecTest(void) vbtlk_retval[2] = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; vbtlk_retval[3] = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; vbtlk_retval[4] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE; - TEST_EQ(VbBootRecoveryMenu(&ctx), VB2_SUCCESS, + TEST_EQ(VbBootRecoveryMenu(ctx), VB2_SUCCESS, "INSERT boots after valid image appears"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_EQ(virtdev_set, 0, " virtual dev mode off"); TEST_EQ(screens_displayed[0], VB_SCREEN_RECOVERY_NO_GOOD, @@ -1471,11 +1469,11 @@ 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(VbBootRecoveryMenu(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"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_EQ(screens_displayed[0], VB_SCREEN_OS_BROKEN, " broken screen"); @@ -1498,11 +1496,11 @@ static void VbBootRecTest(void) mock_keypress[i++] = VB_BUTTON_VOL_DOWN_LONG_PRESS; mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; vbtlk_retval[0] = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; - TEST_EQ(VbBootRecoveryMenu(&ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootRecoveryMenu(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"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_EQ(screens_displayed[0], VB_SCREEN_RECOVERY_INSERT, " insert screen"); @@ -1515,9 +1513,9 @@ 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(VbBootRecoveryMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, "Power Off BROKEN through OPTIONS"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_NEQ(shutdown_request_calls_left, 0, " powered down explicitly"); TEST_EQ(screens_displayed[0], VB_SCREEN_OS_BROKEN, @@ -1535,9 +1533,9 @@ 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(VbBootRecoveryMenu(ctx), VBERROR_SHUTDOWN_REQUESTED, "Power Off NOGOOD through OPTIONS"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_NEQ(shutdown_request_calls_left, 0, " powered down explicitly"); TEST_EQ(screens_displayed[0], VB_SCREEN_RECOVERY_NO_GOOD, @@ -1558,9 +1556,9 @@ static void VbBootRecTest(void) mock_keypress[1] = VB_BUTTON_VOL_DOWN_SHORT_PRESS; // power off mock_keypress[2] = VB_BUTTON_POWER_SHORT_PRESS; vbtlk_retval[0] = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; - TEST_EQ(VbBootRecoveryMenu(&ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootRecoveryMenu(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(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_NEQ(shutdown_request_calls_left, 0, " powered down explicitly"); TEST_EQ(screens_displayed[0], VB_SCREEN_RECOVERY_INSERT, @@ -1578,9 +1576,9 @@ 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(VbBootRecoveryMenu(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(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 1, " no debug info"); TEST_EQ(shutdown_request_calls_left, 0, " timed out"); TEST_EQ(screens_displayed[0], VB_SCREEN_OS_BROKEN, @@ -1596,9 +1594,9 @@ 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(VbBootRecoveryMenu(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(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 1, " no debug info"); TEST_EQ(shutdown_request_calls_left, 0, " timed out"); TEST_EQ(screens_displayed[0], VB_SCREEN_RECOVERY_NO_GOOD, @@ -1619,11 +1617,11 @@ 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(VbBootRecoveryMenu(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"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); i = 0; TEST_EQ(screens_displayed[i++], VB_SCREEN_RECOVERY_INSERT, @@ -1649,9 +1647,9 @@ 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(VbBootRecoveryMenu(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(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_EQ(virtdev_set, 1, " virtual dev mode on"); i = 0; @@ -1671,9 +1669,9 @@ 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(VbBootRecoveryMenu(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(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_EQ(shutdown_request_calls_left, 0, " timed out"); i = 0; @@ -1694,9 +1692,9 @@ 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(VbBootRecoveryMenu(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(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_EQ(shutdown_request_calls_left, 0, " timed out"); i = 0; @@ -1724,9 +1722,9 @@ 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(VbBootRecoveryMenu(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(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_NEQ(shutdown_request_calls_left, 0, " aborted explicitly"); TEST_EQ(virtdev_set, 1, " virtual dev mode on"); @@ -1748,9 +1746,9 @@ 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(VbBootRecoveryMenu(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(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_EQ(shutdown_request_calls_left, 0, " timed out"); TEST_EQ(virtdev_set, 0, " virtual dev mode wasn't enabled again"); @@ -1776,11 +1774,11 @@ static void VbBootRecTest(void) mock_keypress[57] = VB_BUTTON_POWER_SHORT_PRESS; vbtlk_retval[0] = VB2_ERROR_MOCK - VB_DISK_FLAG_REMOVABLE; vbtlk_retval[1] = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; - TEST_EQ(VbBootRecoveryMenu(&ctx), VBERROR_SHUTDOWN_REQUESTED, + TEST_EQ(VbBootRecoveryMenu(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"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_EQ(screens_displayed[0], VB_SCREEN_RECOVERY_NO_GOOD, " nogood screen"); @@ -1807,11 +1805,11 @@ static void VbBootRecTest(void) vbtlk_retval[2] = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; vbtlk_retval[3] = VBERROR_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(VbBootRecoveryMenu(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"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_EQ(screens_displayed[0], VB_SCREEN_RECOVERY_INSERT, " insert screen"); @@ -1834,11 +1832,11 @@ static void VbBootRecTest(void) mock_keypress[0] = VB_BUTTON_VOL_UP_SHORT_PRESS; // enter OPTIONS vbtlk_retval[0] = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; vbtlk_retval[1] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE; - TEST_EQ(VbBootRecoveryMenu(&ctx), VB2_SUCCESS, + TEST_EQ(VbBootRecoveryMenu(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"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); TEST_EQ(screens_displayed[0], VB_SCREEN_RECOVERY_INSERT, " insert screen"); @@ -1867,7 +1865,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(VbBootRecoveryMenu(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"); @@ -1914,7 +1912,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(VbBootRecoveryMenu(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"); @@ -1978,7 +1976,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(VbBootDeveloperMenu(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"); @@ -2098,7 +2096,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(VbBootRecoveryMenu(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"); @@ -2226,14 +2224,14 @@ static void VbNavigationTest(void) mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; // Select altfw menu 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, + vb2_nv_set(ctx, VB2_NV_DEV_BOOT_LEGACY, 1); + TEST_EQ(VbBootDeveloperMenu(ctx), vbtlk_retval_fixed, "developer mode long navigation"); TEST_EQ(debug_info_displayed, 1, " showed debug info"); TEST_EQ(vbexlegacy_called, 1, " tried legacy"); TEST_EQ(altfw_num, 2, " check altfw_num"); TEST_EQ(audio_looping_calls_left, 0, " audio timeout"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); + TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); i = 0; TEST_EQ(screens_displayed[i++], VB_SCREEN_DEVELOPER_WARNING_MENU, " dev warning menu: power off"); |