depthcharge/ui: Drop support of VB2_SCREEN_BLANK
Stop supporting screen drawing for VB2_SCREEN_BLANK. Always enable
backlight in init_screen().
BUG=none
TEST=emerge-asurada depthcharge
BRANCH=none
Cq-Depend: chromium:2793448
Change-Id: I112facd4e09a24cae31094fae89c385ca38a0518
Signed-off-by: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/depthcharge/+/2793450
Reviewed-by: Julius Werner <jwerner@chromium.org>
diff --git a/src/vboot/ui/common.c b/src/vboot/ui/common.c
index b52c92c..c0ff3f9 100644
--- a/src/vboot/ui/common.c
+++ b/src/vboot/ui/common.c
@@ -95,6 +95,8 @@
return VB2_ERROR_UI_DISPLAY_INIT;
enable_graphics_buffer();
+ backlight_update(1);
+
initialized = 1;
return VB2_SUCCESS;
}
@@ -242,9 +244,6 @@
VB2_TRY(init_screen());
- /* If the screen is blank, turn off the backlight; else turn it on. */
- backlight_update(screen->id != VB2_SCREEN_BLANK);
-
if (state->error_code != VB2_UI_ERROR_NONE)
error = &errors[state->error_code];
diff --git a/src/vboot/ui/screens.c b/src/vboot/ui/screens.c
index 1bed7b2..2de4180 100644
--- a/src/vboot/ui/screens.c
+++ b/src/vboot/ui/screens.c
@@ -123,23 +123,6 @@
}
/******************************************************************************/
-/* VB2_SCREEN_BLANK */
-
-static vb2_error_t draw_blank(const struct ui_state *state,
- const struct ui_state *prev_state)
-{
- clear_screen(&ui_color_bg);
- return VB2_SUCCESS;
-}
-
-static const struct ui_screen_info blank_screen = {
- .id = VB2_SCREEN_BLANK,
- .no_footer = 1,
- .draw = draw_blank,
- .mesg = NULL,
-};
-
-/******************************************************************************/
/* VB2_SCREEN_FIRMWARE_SYNC */
static const char *const firmware_sync_desc[] = {
@@ -1051,7 +1034,6 @@
* screen, based on the menu information passed from vboot.
*/
static const struct ui_screen_info *const screens[] = {
- &blank_screen,
&firmware_sync_screen,
&language_select_screen,
&broken_screen,
