diff options
author | Hsuan Ting Chen <roccochen@chromium.org> | 2020-11-20 19:53:33 +0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-12-23 16:50:46 +0000 |
commit | e4f8b0decad7c1f5016d5476f4b4ee23ac8c000d (patch) | |
tree | 77a289712a33488a3b53271a675daea9b0eed3fc | |
parent | 9a820d73511379877b077fde452c31fede89da23 (diff) | |
download | vboot-e4f8b0decad7c1f5016d5476f4b4ee23ac8c000d.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>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2589202
Tested-by: Chung-Sheng Wu <chungsheng@chromium.org>
Tested-by: Karthikeyan Ramasubramanian <kramasub@chromium.org>
Reviewed-by: Karthikeyan Ramasubramanian <kramasub@chromium.org>
Commit-Queue: Karthikeyan Ramasubramanian <kramasub@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 2ec779c7..487aaa57 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) { @@ -1147,6 +1148,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; @@ -1176,14 +1178,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) @@ -1215,6 +1227,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 = { @@ -1223,6 +1238,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, }; /******************************************************************************/ |