diff options
| author | Randall Spangler <rspangler@chromium.org> | 2018-01-02 15:40:04 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-01-09 14:14:16 -0800 |
| commit | 7d92bd8a6ba2640cc6588607af9886c9ecef4127 (patch) | |
| tree | 5b36808bff07e3b6f52bbd2e97ef4cc7a233163c /firmware/lib/include | |
| parent | 39427240693b31942f89385d3b01083fea1b0678 (diff) | |
| download | vboot-7d92bd8a6ba2640cc6588607af9886c9ecef4127.tar.gz | |
firmware: Remove bmpblk code
All screens are now drawn by depthcharge. ToT firmware does not
include a bmpblk / bmpfv section in the GBB. Remove the code paths
which are no longer used.
Also drop a few cparams parameters from functions that no longer use
it, now that those functions don't need to access the GBB.
BUG=chromium:502066
BRANCH=none
TEST=make -j runtests; build bob firmware and check recovery screens
Change-Id: I4d2d0a3ba57c34151e65c6f42581df823192a4ae
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/852371
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-by: Stefan Reinauer <reinauer@chromium.org>
Diffstat (limited to 'firmware/lib/include')
| -rw-r--r-- | firmware/lib/include/vboot_display.h | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/firmware/lib/include/vboot_display.h b/firmware/lib/include/vboot_display.h index fbb04e13..8e6a4546 100644 --- a/firmware/lib/include/vboot_display.h +++ b/firmware/lib/include/vboot_display.h @@ -8,48 +8,20 @@ #ifndef VBOOT_REFERENCE_VBOOT_DISPLAY_H_ #define VBOOT_REFERENCE_VBOOT_DISPLAY_H_ -#include "bmpblk_font.h" - struct vb2_context; -VbError_t VbDisplayScreenFromGBB(struct vb2_context *ctx, - VbCommonParams *cparams, uint32_t screen, - uint32_t locale); -VbError_t VbDisplayScreen(struct vb2_context *ctx, VbCommonParams *cparams, - uint32_t screen, int force); -VbError_t VbDisplayMenu(struct vb2_context *ctx, VbCommonParams *cparams, +VbError_t VbDisplayScreen(struct vb2_context *ctx, uint32_t screen, int force); +VbError_t VbDisplayMenu(struct vb2_context *ctx, uint32_t screen, int force, uint32_t selected_index, uint32_t disabled_idx_mask); VbError_t VbDisplayDebugInfo(struct vb2_context *ctx, VbCommonParams *cparams); VbError_t VbCheckDisplayKey(struct vb2_context *ctx, VbCommonParams *cparams, uint32_t key); -/* Internal functions, for unit testing */ - -typedef FontArrayHeader VbFont_t; - -VbFont_t *VbInternalizeFontData(FontArrayHeader *fonthdr); - -void VbDoneWithFontForNow(VbFont_t *ptr); - -ImageInfo *VbFindFontGlyph(VbFont_t *font, uint32_t ascii, - void **bufferptr, uint32_t *buffersize); - -/** - * Try to display the specified text at a particular position. - */ -void VbRenderTextAtPos(const char *text, int right_to_left, - uint32_t x, uint32_t y, VbFont_t *font); - /** * Return a description of the recovery reason code. */ const char *RecoveryReasonString(uint8_t code); -/** - * Get the number of localizations in the GBB bitmap data. - */ -VbError_t VbGetLocalizationCount(VbCommonParams *cparams, uint32_t *count); - #endif /* VBOOT_REFERENCE_VBOOT_DISPLAY_H_ */ |