diff options
| author | Hsuan Ting Chen <roccochen@chromium.org> | 2020-11-20 19:53:33 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-11-26 13:18:13 +0000 |
| commit | 8f083896bd3df75dec79a099bb0fc2c57fea16ba (patch) | |
| tree | 75e7f3485cd4530ce3d28a9238d32e2666b12087 | |
| parent | 48195e5878006ac2cf74cb7f02953ab06c68202d (diff) | |
| download | vboot-8f083896bd3df75dec79a099bb0fc2c57fea16ba.tar.gz | |
minidiag: Fix button initialization errors in memory tests
Call log_page_init(ui) to initialize button states in memory tests.
Add TODO comments for splitting out log_page_update().
BUG=b:173772273
BRANCH=zork
TEST=Build locally
Signed-off-by: Hsuan Ting Chen <roccochen@chromium.org>
Change-Id: Icc5504bfcbfefc264a01289cc7988e97064bc8fd
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2552308
Reviewed-by: Meng-Huan Yu <menghuan@chromium.org>
Reviewed-by: Yu-Ping Wu <yupingso@chromium.org>
| -rw-r--r-- | firmware/2lib/2ui_screens.c | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/firmware/2lib/2ui_screens.c b/firmware/2lib/2ui_screens.c index 9571ab1f..4aeeda14 100644 --- a/firmware/2lib/2ui_screens.c +++ b/firmware/2lib/2ui_screens.c @@ -60,6 +60,7 @@ static vb2_error_t power_off_action(struct vb2_ui_context *ui) * current_page is valid in prev and next actions, and the back_item is assigned * to a correct menu item index. */ +/* TODO(b/174127808): Split out enabling/disabling buttons. */ static vb2_error_t log_page_init(struct vb2_ui_context *ui) { @@ -1153,6 +1154,7 @@ static vb2_error_t diagnostics_memory_update_screen(struct vb2_ui_context *ui, ui->error_code = VB2_UI_ERROR_DIAGNOSTICS; return vb2_ui_screen_back(ui); } + /* TODO(b/174127808): Integrate this into a new log_page_* function. */ if (ui->state->current_page >= ui->state->page_count) ui->state->current_page = ui->state->page_count - 1; @@ -1182,14 +1184,24 @@ static vb2_error_t diagnostics_memory_update_screen(struct vb2_ui_context *ui, static vb2_error_t diagnostics_memory_init_quick(struct vb2_ui_context *ui) { - return diagnostics_memory_update_screen( + vb2_error_t rv; + rv = diagnostics_memory_update_screen( ui, &vb2ex_diag_memory_quick_test, 1); + + if (rv != VB2_REQUEST_UI_CONTINUE) + return rv; + return log_page_init(ui); } static vb2_error_t diagnostics_memory_init_full(struct vb2_ui_context *ui) { - return diagnostics_memory_update_screen( + vb2_error_t rv; + rv = diagnostics_memory_update_screen( ui, &vb2ex_diag_memory_full_test, 1); + + if (rv != VB2_REQUEST_UI_CONTINUE) + return rv; + return log_page_init(ui); } static vb2_error_t diagnostics_memory_update_quick(struct vb2_ui_context *ui) @@ -1221,6 +1233,9 @@ static const struct vb2_screen_info diagnostics_memory_quick_screen = { .init = diagnostics_memory_init_quick, .action = diagnostics_memory_update_quick, .menu = MENU_ITEMS(diagnostics_memory_items), + .page_up_item = DIAGNOSTICS_MEMORY_ITEM_PAGE_UP, + .page_down_item = DIAGNOSTICS_MEMORY_ITEM_PAGE_DOWN, + .back_item = DIAGNOSTICS_MEMORY_ITEM_CANCEL, }; static const struct vb2_screen_info diagnostics_memory_full_screen = { @@ -1229,6 +1244,9 @@ static const struct vb2_screen_info diagnostics_memory_full_screen = { .init = diagnostics_memory_init_full, .action = diagnostics_memory_update_full, .menu = MENU_ITEMS(diagnostics_memory_items), + .page_up_item = DIAGNOSTICS_MEMORY_ITEM_PAGE_UP, + .page_down_item = DIAGNOSTICS_MEMORY_ITEM_PAGE_DOWN, + .back_item = DIAGNOSTICS_MEMORY_ITEM_CANCEL, }; /******************************************************************************/ |