summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandru M Stan <amstan@chromium.org>2015-12-18 15:28:32 -0800
committerChromeOS bot <3su6n15k.default@developer.gserviceaccount.com>2016-01-30 01:38:11 +0000
commitf47c086d21c36b6e9850ad251a76319e86951606 (patch)
tree157c6f96b2f2f9109360189b6477b921786c06f7
parentad65e3da6bb4a4cd00091ea961cd31e9ccf0536f (diff)
downloadvboot-f47c086d21c36b6e9850ad251a76319e86951606.tar.gz
Increase MAX_CUSTOM_DELAY to 5 minutes
Rialto will soon need a longer dev mode delay, this variable would prevent it. BUG=chrome-os-partner:48657 TEST=See follow up CLs BRANCH=master Change-Id: Ie5ada9c5441b5b042bd0801d66559ab715fbbf47 Signed-off-by: Alexandru M Stan <amstan@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/323832 Commit-Ready: Alexandru Stan <amstan@chromium.org> Tested-by: Alexandru Stan <amstan@chromium.org> Reviewed-by: Randall Spangler <rspangler@chromium.org> Reviewed-by: Julius Werner <jwerner@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/321384
-rw-r--r--firmware/lib/vboot_audio.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/firmware/lib/vboot_audio.c b/firmware/lib/vboot_audio.c
index e24a039b..6071b0db 100644
--- a/firmware/lib/vboot_audio.c
+++ b/firmware/lib/vboot_audio.c
@@ -22,12 +22,12 @@
/*
* Need one second of noise in the first 22 seconds.
- * Total delay >= 30 seconds, <= 60 seconds.
+ * Total delay >= 30 seconds, <= 5 minutes.
*/
-#define REQUIRED_NOISE_TIME 1000
-#define REQUIRED_NOISE_WITHIN 22000
-#define REQUIRED_TOTAL_DELAY 30000
-#define MAX_CUSTOM_DELAY 60000
+#define REQUIRED_NOISE_TIME 1000
+#define REQUIRED_NOISE_WITHIN 22000
+#define REQUIRED_TOTAL_DELAY 30000
+#define MAX_CUSTOM_DELAY 300000
/* These are visible externally only to make testing easier */
VbDevMusicNote default_notes_[] = { {20000, 0}, /* 20 seconds */
@@ -155,7 +155,7 @@ static void VbGetDevMusicNotes(VbAudioContext *audio, int use_short)
goto nope;
/*
- * We'll also require that the total time be less than a minute. No
+ * We'll also require that the total time be less than 5 minutes. No
* real reason, it just gives us less to worry about.
*/
VBDEBUG(("VbGetDevMusicNotes: lasting %d msecs\n", total_msecs));