From 371d33783f3304732135e069d0c91b398c5375d4 Mon Sep 17 00:00:00 2001 From: Yu-Ping Wu Date: Wed, 15 Jan 2020 16:47:37 +0800 Subject: vboot: Convert UI errors to vboot2-style Error codes are renamed as follows: VBERROR_INVALID_SCREEN_INDEX --> VB2_ERROR_UI_INVALID_SCREEN VBERROR_SCREEN_DRAW --> VB2_ERROR_UI_DRAW_FAILURE In addition, add new error code VB2_ERROR_UI_DISPLAY_INIT. BRANCH=none BUG=none TEST=emerge-nami depthcharge Cq-Depend: chromium:2002310 Change-Id: I1381762fbe1a9bb0c76e7e7d64a0732799c3bf0f Signed-off-by: Yu-Ping Wu Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2002309 Reviewed-by: Joel Kitching --- firmware/2lib/include/2return_codes.h | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/firmware/2lib/include/2return_codes.h b/firmware/2lib/include/2return_codes.h index fa6bf68a..0394feed 100644 --- a/firmware/2lib/include/2return_codes.h +++ b/firmware/2lib/include/2return_codes.h @@ -71,8 +71,6 @@ enum vb2_return_code { VBERROR_SHUTDOWN_REQUESTED = 0x1000D, /* Invalid bitmap volume */ VBERROR_INVALID_BMPFV = 0x10014, - /* Invalid screen index */ - VBERROR_INVALID_SCREEN_INDEX = 0x10015, /* VbExBeep() can't make sound in the background */ VBERROR_NO_BACKGROUND_SOUND = 0x10019, /* Need EC to reboot to read-only code to switch RW slot */ @@ -81,8 +79,6 @@ enum vb2_return_code { VBERROR_EC_REBOOT_TO_RO_REQUIRED = 0x10022, /* No image present */ VBERROR_NO_IMAGE_PRESENT = 0x10026, - /* failed to draw screen */ - VBERROR_SCREEN_DRAW = 0x10027, /* Error reading FWMP from TPM (note: not present is not an error) */ VBERROR_TPM_READ_FWMP = 0x10029, /* Peripheral busy. Cannot upgrade firmware at present. */ @@ -762,6 +758,21 @@ enum vb2_return_code { /* No working block devices were found in VbTryLoadKernel() */ VB2_ERROR_LK_NO_DISK_FOUND = 0x100b3000, + /********************************************************************** + * UI errors + */ + VB2_ERROR_UI = 0x100c0000, + + /* Display initialization failed */ + VB2_ERROR_UI_DISPLAY_INIT = 0x100c1000, + + /* Problem finding screen entry or its draw function */ + VB2_ERROR_UI_INVALID_SCREEN = 0x100c2000, + + /* Screen drawing failed, including all CBGFX_ERROR_* errors returned + from libpayload */ + VB2_ERROR_UI_DRAW_FAILURE = 0x100c3000, + /********************************************************************** * Errors generated by host library (non-firmware) start here. */ -- cgit v1.2.1