mirror of
https://github.com/Telecominfraproject/OpenCellular.git
synced 2025-11-27 03:33:50 +00:00
firmware: fixing menu artifacts during printing
BUG=chrome-os-partner:61275
BRANCH=None
TEST=reboot and switch menus and make sure everything
is printing out properly.
Change-Id: I1269d3dc762a66dde0203673b7b400aba92afa75
Signed-off-by: Shelley Chen <shchen@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/424356
Reviewed-by: Randall Spangler <rspangler@chromium.org>
This commit is contained in:
@@ -235,7 +235,7 @@ static char *dev_warning_menu[] = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
static char *dev_menu[] = {
|
static char *dev_menu[] = {
|
||||||
"Boot Network Image\n",
|
"Boot Network Image (not working yet)\n",
|
||||||
"Boot Legacy BIOS\n",
|
"Boot Legacy BIOS\n",
|
||||||
"Boot USB Image\n",
|
"Boot USB Image\n",
|
||||||
"Boot Developer Image\n",
|
"Boot Developer Image\n",
|
||||||
@@ -643,7 +643,6 @@ VbError_t vb2_developer_menu(struct vb2_context *ctx, VbCommonParams *cparams)
|
|||||||
vb2_get_current_menu_size(current_menu,
|
vb2_get_current_menu_size(current_menu,
|
||||||
NULL, &menu_size);
|
NULL, &menu_size);
|
||||||
current_menu_idx = (current_menu_idx+1) % menu_size;
|
current_menu_idx = (current_menu_idx+1) % menu_size;
|
||||||
VbDisplayScreen(ctx, cparams, VB_SCREEN_DEVELOPER_WARNING, 0);
|
|
||||||
vb2_print_current_menu();
|
vb2_print_current_menu();
|
||||||
break;
|
break;
|
||||||
case VB_KEY_RIGHT:
|
case VB_KEY_RIGHT:
|
||||||
@@ -902,6 +901,14 @@ VbError_t vb2_recovery_menu(struct vb2_context *ctx, VbCommonParams *cparams)
|
|||||||
ret = vb2_update_menu();
|
ret = vb2_update_menu();
|
||||||
if (current_menu != VB_MENU_RECOVERY ||
|
if (current_menu != VB_MENU_RECOVERY ||
|
||||||
current_menu_idx != VB_RECOVERY_DBG_INFO) {
|
current_menu_idx != VB_RECOVERY_DBG_INFO) {
|
||||||
|
// unfortunately we need this screen
|
||||||
|
// blanking to clear previous menus
|
||||||
|
// printed.
|
||||||
|
VbDisplayScreen(ctx, cparams, VB_SCREEN_BLANK, 0);
|
||||||
|
VbDisplayScreen(ctx, cparams, VBERROR_NO_DISK_FOUND == retval ?
|
||||||
|
VB_SCREEN_RECOVERY_INSERT :
|
||||||
|
VB_SCREEN_RECOVERY_NO_GOOD,
|
||||||
|
0);
|
||||||
vb2_print_current_menu();
|
vb2_print_current_menu();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user