diff options
author | edisonhello <edisonhello@google.com> | 2021-09-07 13:12:35 +0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-12-08 21:43:52 +0000 |
commit | e9176ffaffd275be898bdcd816c68d77698d3e4a (patch) | |
tree | 87997614c1da7f87f25623c1faf686f3cc0b6ad1 | |
parent | c597e93127153d7a766540f6815c33b0bfcc098d (diff) | |
download | vboot-e9176ffaffd275be898bdcd816c68d77698d3e4a.tar.gz |
vboot: Remove vb2ex_display_ui, vb2ex_prepare_log_screen
After UI code is centralized, these functions are not used in vboot
anymore. Remove these two functions.
BUG=b:172339016
TEST=DEBUG=1 make -j test_setup && make -j runtests
BRANCH=none
Cq-Depend: chromium:3142705
Signed-off-by: edisonhello <edisonhello@google.com>
Change-Id: If773de4bbe835cb75f76c501429f305ef8d4fec4
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3144446
Reviewed-by: Yu-Ping Wu <yupingso@chromium.org>
-rw-r--r-- | firmware/2lib/2stub.c | 7 | ||||
-rw-r--r-- | firmware/2lib/include/2api.h | 48 |
2 files changed, 0 insertions, 55 deletions
diff --git a/firmware/2lib/2stub.c b/firmware/2lib/2stub.c index 956b4bb4..d53d472f 100644 --- a/firmware/2lib/2stub.c +++ b/firmware/2lib/2stub.c @@ -180,13 +180,6 @@ const char *vb2ex_get_firmware_log(int reset) } __attribute__((weak)) -uint32_t vb2ex_prepare_log_screen(enum vb2_screen screen, uint32_t locale_id, - const char *str) -{ - return 1; -} - -__attribute__((weak)) vb2_error_t vb2ex_diag_get_storage_health(const char **out) { *out = "mock"; diff --git a/firmware/2lib/include/2api.h b/firmware/2lib/include/2api.h index c17da8df..e59f1d30 100644 --- a/firmware/2lib/include/2api.h +++ b/firmware/2lib/include/2api.h @@ -1524,38 +1524,6 @@ enum vb2_ui_error { }; /** - * Display UI screen. - * - * @param screen Screen to display. - * @param locale_id Id of current locale. - * @param selected_item Index of the selected menu item. If the screen - * doesn't have a menu, this value will be ignored. - * @param disabled_item_mask Mask for disabled menu items. Bit (1 << idx) - * indicates whether item 'idx' is disabled. - * A disabled menu item is visible and selectable, - * with a different button style. - * @param hidden_item_mask Mask for hidden menu items. Bit (1 << idx) - * indicates whether item 'idx' is hidden. - * A hidden menu item is neither visible nor - * selectable. - * @param timer_disabled Whether timer is disabled or not. Some screen - * descriptions will depend on this value. - * @param current_page Current page number for a log screen. If the - * screen doesn't show logs, this value will be - * ignored. - * @param error_code Error code if an error occurred. - * @return VB2_SUCCESS, or error code on error. - */ -vb2_error_t vb2ex_display_ui(enum vb2_screen screen, - uint32_t locale_id, - uint32_t selected_item, - uint32_t disabled_item_mask, - uint32_t hidden_item_mask, - int timer_disabled, - uint32_t current_page, - enum vb2_ui_error error_code); - -/** * Check that physical presence button is currently pressed by the user. * * @return 1 for pressed, 0 for not. @@ -1647,22 +1615,6 @@ char *vb2api_get_debug_info(struct vb2_context *ctx); const char *vb2ex_get_firmware_log(int reset); /** - * Specify the string to be used for an upcoming log screen display. - * - * Before a vb2ex_display_ui() call is made for a screen which displays logs, - * the log string should be provided via this function. The total number of - * pages in the log string is returned. If the log string ever changes, this - * function should be called again before the next vb2ex_display_ui() call. - * - * @param screen Screen to display the log. - * @param locale_id Id of current locale. - * @param str The log string to display. - * @return The number of pages after pagination. 0 if none or error. - */ -uint32_t vb2ex_prepare_log_screen(enum vb2_screen screen, uint32_t locale_id, - const char *str); - -/** * Get the health info of the storage. * * @param out For returning a read-only pointer of full log string which is |