diff options
Diffstat (limited to 'firmware/lib/vboot_ui.c')
| -rw-r--r-- | firmware/lib/vboot_ui.c | 41 |
1 files changed, 15 insertions, 26 deletions
diff --git a/firmware/lib/vboot_ui.c b/firmware/lib/vboot_ui.c index 4057ed18..1776e4f6 100644 --- a/firmware/lib/vboot_ui.c +++ b/firmware/lib/vboot_ui.c @@ -213,7 +213,7 @@ VbError_t vb2_developer_ui(struct vb2_context *ctx, VbCommonParams *cparams) /* If dev mode is disabled, only allow TONORM */ while (disable_dev_boot) { VB2_DEBUG("dev_disable_boot is set\n"); - VbDisplayScreen(ctx, cparams, VB_SCREEN_DEVELOPER_TO_NORM, 0); + VbDisplayScreen(ctx, VB_SCREEN_DEVELOPER_TO_NORM, 0); VbExDisplayDebugInfo(dev_disable_msg); /* Ignore space in VbUserConfirms()... */ @@ -221,9 +221,7 @@ VbError_t vb2_developer_ui(struct vb2_context *ctx, VbCommonParams *cparams) case 1: VB2_DEBUG("leaving dev-mode\n"); vb2_nv_set(ctx, VB2_NV_DISABLE_DEV_REQUEST, 1); - VbDisplayScreen(ctx, cparams, - VB_SCREEN_TO_NORM_CONFIRMED, - 0); + VbDisplayScreen(ctx, VB_SCREEN_TO_NORM_CONFIRMED, 0); VbExSleepMs(5000); return VBERROR_REBOOT_REQUIRED; case -1: @@ -236,7 +234,7 @@ VbError_t vb2_developer_ui(struct vb2_context *ctx, VbCommonParams *cparams) } /* Show the dev mode warning screen */ - VbDisplayScreen(ctx, cparams, VB_SCREEN_DEVELOPER_WARNING, 0); + VbDisplayScreen(ctx, VB_SCREEN_DEVELOPER_WARNING, 0); /* Initialize audio/delay context */ vb2_audio_start(ctx); @@ -278,9 +276,8 @@ VbError_t vb2_developer_ui(struct vb2_context *ctx, VbCommonParams *cparams) VbExBeep(120, 400); break; } - VbDisplayScreen(ctx, cparams, - VB_SCREEN_DEVELOPER_TO_NORM, - 0); + VbDisplayScreen(ctx, + VB_SCREEN_DEVELOPER_TO_NORM, 0); /* Ignore space in VbUserConfirms()... */ switch (VbUserConfirms(ctx, cparams, 0)) { case 1: @@ -288,9 +285,7 @@ VbError_t vb2_developer_ui(struct vb2_context *ctx, VbCommonParams *cparams) vb2_nv_set(ctx, VB2_NV_DISABLE_DEV_REQUEST, 1); VbDisplayScreen(ctx, - cparams, - VB_SCREEN_TO_NORM_CONFIRMED, - 0); + VB_SCREEN_TO_NORM_CONFIRMED, 0); VbExSleepMs(5000); return VBERROR_REBOOT_REQUIRED; case -1: @@ -300,9 +295,7 @@ VbError_t vb2_developer_ui(struct vb2_context *ctx, VbCommonParams *cparams) /* Stay in dev-mode */ VB2_DEBUG("stay in dev-mode\n"); VbDisplayScreen(ctx, - cparams, - VB_SCREEN_DEVELOPER_WARNING, - 0); + VB_SCREEN_DEVELOPER_WARNING, 0); /* Start new countdown */ vb2_audio_start(ctx); } @@ -355,17 +348,14 @@ VbError_t vb2_developer_ui(struct vb2_context *ctx, VbCommonParams *cparams) * Clear the screen to show we get the Ctrl+U * key press. */ - VbDisplayScreen(ctx, cparams, VB_SCREEN_BLANK, - 0); + VbDisplayScreen(ctx, VB_SCREEN_BLANK, 0); if (VBERROR_SUCCESS == VbTryUsb(ctx, cparams)) { return VBERROR_SUCCESS; } else { /* Show dev mode warning screen again */ VbDisplayScreen(ctx, - cparams, - VB_SCREEN_DEVELOPER_WARNING, - 0); + VB_SCREEN_DEVELOPER_WARNING, 0); } } break; @@ -398,7 +388,7 @@ VbError_t vb2_developer_ui(struct vb2_context *ctx, VbCommonParams *cparams) VbError_t VbBootDeveloper(struct vb2_context *ctx, VbCommonParams *cparams) { VbError_t retval = vb2_developer_ui(ctx, cparams); - VbDisplayScreen(ctx, cparams, VB_SCREEN_BLANK, 0); + VbDisplayScreen(ctx, VB_SCREEN_BLANK, 0); return retval; } @@ -436,7 +426,7 @@ static VbError_t recovery_ui(struct vb2_context *ctx, VbCommonParams *cparams) */ vb2_nv_commit(ctx); - VbDisplayScreen(ctx, cparams, VB_SCREEN_OS_BROKEN, 0); + VbDisplayScreen(ctx, VB_SCREEN_OS_BROKEN, 0); VB2_DEBUG("VbBootRecovery() waiting for manual recovery\n"); while (1) { key = VbExKeyboardRead(); @@ -465,7 +455,7 @@ static VbError_t recovery_ui(struct vb2_context *ctx, VbCommonParams *cparams) if (VBERROR_SUCCESS == retval) break; /* Found a recovery kernel */ - VbDisplayScreen(ctx, cparams, VBERROR_NO_DISK_FOUND == retval ? + VbDisplayScreen(ctx, VBERROR_NO_DISK_FOUND == retval ? VB_SCREEN_RECOVERY_INSERT : VB_SCREEN_RECOVERY_NO_GOOD, 0); @@ -504,9 +494,8 @@ static VbError_t recovery_ui(struct vb2_context *ctx, VbCommonParams *cparams) } /* Ask the user to confirm entering dev-mode */ - VbDisplayScreen(ctx, cparams, - VB_SCREEN_RECOVERY_TO_DEV, - 0); + VbDisplayScreen(ctx, + VB_SCREEN_RECOVERY_TO_DEV, 0); /* SPACE means no... */ uint32_t vbc_flags = VB_CONFIRM_SPACE_MEANS_NO | @@ -550,6 +539,6 @@ static VbError_t recovery_ui(struct vb2_context *ctx, VbCommonParams *cparams) VbError_t VbBootRecovery(struct vb2_context *ctx, VbCommonParams *cparams) { VbError_t retval = recovery_ui(ctx, cparams); - VbDisplayScreen(ctx, cparams, VB_SCREEN_BLANK, 0); + VbDisplayScreen(ctx, VB_SCREEN_BLANK, 0); return retval; } |