diff options
| -rw-r--r-- | Android.mk | 1 | ||||
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | firmware/lib/include/vboot_audio.h | 23 | ||||
| -rw-r--r-- | firmware/lib/vboot_audio.c | 57 | ||||
| -rw-r--r-- | tests/vb2_auxfw_sync_tests.c | 1 | ||||
| -rw-r--r-- | tests/vb2_ec_sync_tests.c | 1 | ||||
| -rw-r--r-- | tests/vboot_api_kernel4_tests.c | 1 |
7 files changed, 0 insertions, 85 deletions
@@ -54,7 +54,6 @@ VBSLK_SRCS = \ firmware/lib/gpt_misc.c \ firmware/lib/utility_string.c \ firmware/lib/vboot_api_kernel.c \ - firmware/lib/vboot_audio.c \ firmware/lib/vboot_display.c \ firmware/lib/vboot_kernel.c \ firmware/lib/region-kernel.c \ @@ -408,7 +408,6 @@ FWLIB_SRCS = \ $(if ${FIRMWARE_ARCH},FWLIB_SRCS,TESTLIB_SRCS) += \ firmware/2lib/2ui.c \ firmware/2lib/2ui_screens.c \ - firmware/lib/vboot_audio.c # TPM lightweight command library ifeq (${TPM2_MODE},) diff --git a/firmware/lib/include/vboot_audio.h b/firmware/lib/include/vboot_audio.h deleted file mode 100644 index 64cf0a78..00000000 --- a/firmware/lib/include/vboot_audio.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - * - * Delay/beep functions used in dev-mode kernel selection. - */ - -#ifndef VBOOT_REFERENCE_VBOOT_AUDIO_H_ -#define VBOOT_REFERENCE_VBOOT_AUDIO_H_ - -#include "vboot_api.h" - -/** - * Initialization function. - */ -void vb2_audio_start(struct vb2_context *ctx); - -/** - * Caller should loop without extra delay until this returns false. - */ -int vb2_audio_looping(void); - -#endif /* VBOOT_REFERENCE_VBOOT_AUDIO_H_ */ diff --git a/firmware/lib/vboot_audio.c b/firmware/lib/vboot_audio.c deleted file mode 100644 index c2c599bf..00000000 --- a/firmware/lib/vboot_audio.c +++ /dev/null @@ -1,57 +0,0 @@ -/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - * - * Delay/beep functions used in dev-mode kernel selection. - */ - -#include "2api.h" -#include "2common.h" -#include "2misc.h" -#include "2sysincludes.h" -#include "vboot_api.h" -#include "vboot_audio.h" - -int audio_open_count = 0; /* Times audio has been opened */ -static int audio_use_short; /* Use short delay? */ -static uint32_t open_time; /* Time of last open */ -static int beep_count; /* Number of beeps so far */ - -/** - * Initialization function. - */ -void vb2_audio_start(struct vb2_context *ctx) -{ - open_time = vb2ex_mtime(); /* "zero" starts now */ - beep_count = 0; - - 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; - } else { - audio_use_short = 0; - } -} - -/** - * Caller should loop without extra delay until this returns false. - */ -int vb2_audio_looping(void) -{ - uint32_t now = vb2ex_mtime() - open_time; - - /* If we're using short delay, wait 2 seconds and don't beep */ - if (audio_use_short) - return now < 2 * VB2_MSEC_PER_SEC; - - /* Otherwise, beep at 20 and 20.5 seconds */ - if ((beep_count == 0 && now > 20 * VB2_MSEC_PER_SEC) || - (beep_count == 1 && now > 20 * VB2_MSEC_PER_SEC + 500)) { - vb2ex_beep(250, 400); - beep_count++; - } - - /* Stop after 30 seconds */ - return (now < 30 * VB2_MSEC_PER_SEC); -} diff --git a/tests/vb2_auxfw_sync_tests.c b/tests/vb2_auxfw_sync_tests.c index f779ac05..48ce9529 100644 --- a/tests/vb2_auxfw_sync_tests.c +++ b/tests/vb2_auxfw_sync_tests.c @@ -16,7 +16,6 @@ #include "host_common.h" #include "load_kernel_fw.h" #include "test_common.h" -#include "vboot_audio.h" #include "vboot_kernel.h" #include "vboot_struct.h" diff --git a/tests/vb2_ec_sync_tests.c b/tests/vb2_ec_sync_tests.c index be86fbb4..8881ea73 100644 --- a/tests/vb2_ec_sync_tests.c +++ b/tests/vb2_ec_sync_tests.c @@ -13,7 +13,6 @@ #include "host_common.h" #include "load_kernel_fw.h" #include "test_common.h" -#include "vboot_audio.h" #include "vboot_kernel.h" #include "vboot_struct.h" diff --git a/tests/vboot_api_kernel4_tests.c b/tests/vboot_api_kernel4_tests.c index 5229ee55..a25132f7 100644 --- a/tests/vboot_api_kernel4_tests.c +++ b/tests/vboot_api_kernel4_tests.c @@ -17,7 +17,6 @@ #include "test_common.h" #include "tlcl.h" #include "tss_constants.h" -#include "vboot_audio.h" #include "vboot_kernel.h" #include "vboot_struct.h" #include "vboot_test.h" |