summaryrefslogtreecommitdiff
path: root/firmware/2lib/2ui_screens.c
diff options
context:
space:
mode:
authorHsuan Ting Chen <roccochen@chromium.org>2020-11-02 19:32:29 +0800
committerCommit Bot <commit-bot@chromium.org>2020-11-04 11:49:58 +0000
commit10343b821fbc1e1ff9db19af45c9c0827389df7f (patch)
treeba54243231658b1c97fabfd5fecfd2a323bb54ae /firmware/2lib/2ui_screens.c
parent935e2b9d3fc0dbe67cb93acaa16bac9d49bff894 (diff)
downloadvboot-stabilize-13591.B.tar.gz
vboot/ui/tests: Add time-related constants in 2ui_private.hstabilize-13591.B
Add several constants in 2ui_private.h for testing: - KEY_DELAY_MS - DEV_DELAY_SHORT_MS - DEV_DELAY_NORMAL_MS - DEV_DELAY_BEEP1_MS - DEV_DELAY_BEEP2_MS BUG=b:156448738 BRANCH=none TEST=CC=x86_64-pc-linux-gnu-clang; make clean && make runtests Signed-off-by: Hsuan Ting Chen <roccochen@chromium.org> Change-Id: I7349d5214a90699fda67135329d7a6b93022bb27 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2513418 Reviewed-by: Yu-Ping Wu <yupingso@chromium.org> Reviewed-by: Joel Kitching <kitching@chromium.org>
Diffstat (limited to 'firmware/2lib/2ui_screens.c')
-rw-r--r--firmware/2lib/2ui_screens.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/firmware/2lib/2ui_screens.c b/firmware/2lib/2ui_screens.c
index fecfaa99..1b4c5e29 100644
--- a/firmware/2lib/2ui_screens.c
+++ b/firmware/2lib/2ui_screens.c
@@ -789,21 +789,21 @@ vb2_error_t developer_mode_action(struct vb2_ui_context *ui)
elapsed_ms = vb2ex_mtime() - ui->start_time_ms;
/* If we're using short delay, wait 2 seconds and don't beep. */
- if (use_short && elapsed_ms > 2 * VB2_MSEC_PER_SEC) {
+ if (use_short && elapsed_ms > DEV_DELAY_SHORT_MS) {
VB2_DEBUG("Booting default target after 2s\n");
ui->disable_timer = 1;
return vb2_ui_menu_select(ui);
}
/* Otherwise, beep at 20 and 20.5 seconds. */
- if ((ui->beep_count == 0 && elapsed_ms > 20 * VB2_MSEC_PER_SEC) ||
- (ui->beep_count == 1 && elapsed_ms > 20 * VB2_MSEC_PER_SEC + 500)) {
+ if ((ui->beep_count == 0 && elapsed_ms > DEV_DELAY_BEEP1_MS) ||
+ (ui->beep_count == 1 && elapsed_ms > DEV_DELAY_BEEP2_MS)) {
vb2ex_beep(250, 400);
ui->beep_count++;
}
/* Stop after 30 seconds. */
- if (elapsed_ms > 30 * VB2_MSEC_PER_SEC) {
+ if (elapsed_ms > DEV_DELAY_NORMAL_MS) {
VB2_DEBUG("Booting default target after 30s\n");
ui->disable_timer = 1;
return vb2_ui_menu_select(ui);