diff options
Diffstat (limited to 'firmware/2lib/2ui.c')
| -rw-r--r-- | firmware/2lib/2ui.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/firmware/2lib/2ui.c b/firmware/2lib/2ui.c index fea3b4ad..8adfab80 100644 --- a/firmware/2lib/2ui.c +++ b/firmware/2lib/2ui.c @@ -15,7 +15,6 @@ #include "2ui_private.h" #include "vboot_api.h" /* For VB_SHUTDOWN_REQUEST_POWER_BUTTON */ #include "vboot_kernel.h" -#include "vboot_ui_legacy.h" /* TODO(b/144969088): VbDisplayDebugInfo */ #define KEY_DELAY_MS 20 /* Delay between key scans in UI loops */ @@ -326,6 +325,7 @@ vb2_error_t ui_loop(struct vb2_context *ctx, enum vb2_screen root_screen_id, ui.state->selected_item, ui.state->disabled_item_mask, ui.disable_timer, + ui.state->current_page, ui.error_code); if (ui.error_beep) { vb2ex_beep(250, 400); @@ -399,10 +399,8 @@ vb2_error_t developer_action(struct vb2_ui_context *ui) if (ui->key == VB_KEY_CTRL('D') || (DETACHABLE && ui->key == VB_BUTTON_VOL_DOWN_LONG_PRESS)) return vb2_ui_developer_mode_boot_internal_action(ui); - - /* TODO(b/144969088): Re-implement as debug info screen. */ if (ui->key == '\t') - VbDisplayDebugInfo(ui->ctx); + return vb2_ui_screen_change(ui, VB2_SCREEN_DEBUG_INFO); return VB2_REQUEST_UI_CONTINUE; } @@ -417,9 +415,9 @@ vb2_error_t vb2_broken_recovery_menu(struct vb2_context *ctx) vb2_error_t broken_recovery_action(struct vb2_ui_context *ui) { - /* TODO(b/144969088): Re-implement as debug info screen. */ + /* Broken recovery keyboard shortcuts */ if (ui->key == '\t') - VbDisplayDebugInfo(ui->ctx); + return vb2_ui_screen_change(ui, VB2_SCREEN_DEBUG_INFO); return VB2_REQUEST_UI_CONTINUE; } @@ -455,9 +453,8 @@ vb2_error_t manual_recovery_action(struct vb2_ui_context *ui) (DETACHABLE && ui->key == VB_BUTTON_VOL_UP_DOWN_COMBO_PRESS)) return vb2_ui_screen_change(ui, VB2_SCREEN_RECOVERY_TO_DEV); - /* TODO(b/144969088): Re-implement as debug info screen. */ if (ui->key == '\t') - VbDisplayDebugInfo(ui->ctx); + return vb2_ui_screen_change(ui, VB2_SCREEN_DEBUG_INFO); return VB2_REQUEST_UI_CONTINUE; } |