vboot: add vb2api_use_short_dev_screen_delay() to 2api.h
Add vb2api_use_short_dev_screen_delay() to vboot2 API.
BRANCH=none
BUG=b:146399181, b:157871585
TEST=make runtests
Change-Id: Ice4852a7505e8dba73fa2026e8d433b8e487f556
Signed-off-by: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2235292
Reviewed-by: Joel Kitching <kitching@chromium.org>
diff --git a/firmware/2lib/2misc.c b/firmware/2lib/2misc.c
index feee132..6276d8b 100644
--- a/firmware/2lib/2misc.c
+++ b/firmware/2lib/2misc.c
@@ -557,3 +557,9 @@
(gbb->flags & VB2_GBB_FLAG_FORCE_DEV_BOOT_USB) ||
vb2_secdata_fwmp_get_flag(ctx, VB2_SECDATA_FWMP_DEV_ENABLE_USB);
}
+
+int vb2api_use_short_dev_screen_delay(struct vb2_context *ctx)
+{
+ struct vb2_gbb_header *gbb = vb2_get_gbb(ctx);
+ return gbb->flags & VB2_GBB_FLAG_DEV_SCREEN_SHORT_DELAY;
+}
diff --git a/firmware/2lib/2ui_screens.c b/firmware/2lib/2ui_screens.c
index 7423d39..473441e 100644
--- a/firmware/2lib/2ui_screens.c
+++ b/firmware/2lib/2ui_screens.c
@@ -479,8 +479,7 @@
vb2_error_t developer_mode_action(struct vb2_ui_context *ui)
{
- struct vb2_gbb_header *gbb = vb2_get_gbb(ui->ctx);
- const int use_short = gbb->flags & VB2_GBB_FLAG_DEV_SCREEN_SHORT_DELAY;
+ const int use_short = vb2api_use_short_dev_screen_delay(ui->ctx);
uint64_t elapsed;
/* Once any user interaction occurs, stop the timer. */
diff --git a/firmware/2lib/include/2api.h b/firmware/2lib/include/2api.h
index 5b3542b..9eeff85 100644
--- a/firmware/2lib/include/2api.h
+++ b/firmware/2lib/include/2api.h
@@ -882,6 +882,14 @@
enum vb2_dev_default_boot_target vb2api_get_dev_default_boot_target(
struct vb2_context *ctx);
+/**
+ * Whether to use short delay instead of the normal delay in developer screens.
+ *
+ * @param ctx Vboot context
+ * @return 1 for short delay and 0 otherwise.
+ */
+int vb2api_use_short_dev_screen_delay(struct vb2_context *ctx);
+
/*****************************************************************************/
/* APIs provided by the caller to verified boot */
diff --git a/firmware/lib/vboot_audio.c b/firmware/lib/vboot_audio.c
index 7f9b5a5..c2c599b 100644
--- a/firmware/lib/vboot_audio.c
+++ b/firmware/lib/vboot_audio.c
@@ -5,6 +5,7 @@
* Delay/beep functions used in dev-mode kernel selection.
*/
+#include "2api.h"
#include "2common.h"
#include "2misc.h"
#include "2sysincludes.h"
@@ -21,16 +22,10 @@
*/
void vb2_audio_start(struct vb2_context *ctx)
{
- struct vb2_gbb_header *gbb = vb2_get_gbb(ctx);
-
open_time = vb2ex_mtime(); /* "zero" starts now */
beep_count = 0;
- /*
- * Use a short developer screen delay on the first audio if indicated
- * by GBB flags.
- */
- if ((gbb->flags & VB2_GBB_FLAG_DEV_SCREEN_SHORT_DELAY) &&
+ if (vb2api_use_short_dev_screen_delay(ctx) &&
(audio_open_count++ == 0)) {
VB2_DEBUG("vb2_audio_start() - using short dev screen delay\n");
audio_use_short = 1;
diff --git a/tests/vb2_misc_tests.c b/tests/vb2_misc_tests.c
index eaf7869..f363ba5 100644
--- a/tests/vb2_misc_tests.c
+++ b/tests/vb2_misc_tests.c
@@ -1004,6 +1004,19 @@
"dev boot usb - all flags set");
}
+static void use_dev_screen_short_delay_tests(void)
+{
+ /* Normal delay */
+ reset_common_data();
+ TEST_EQ(vb2api_use_short_dev_screen_delay(ctx), 0,
+ "short delay: no");
+
+ /* Short delay */
+ gbb.flags |= VB2_GBB_FLAG_DEV_SCREEN_SHORT_DELAY;
+ TEST_EQ(vb2api_use_short_dev_screen_delay(ctx), 1,
+ "short delay: yes");
+}
+
int main(int argc, char* argv[])
{
init_workbuf_tests();
@@ -1021,6 +1034,7 @@
phone_recovery_enabled_tests();
dev_default_boot_tests();
dev_boot_allowed_tests();
+ use_dev_screen_short_delay_tests();
return gTestSuccess ? 0 : 255;
}
