diff options
| author | Joel Kitching <kitching@google.com> | 2020-04-21 12:50:03 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-05-28 07:11:17 +0000 |
| commit | 72d4c9dae9c910e2bb5d0fcb8b34771fd4ce16f0 (patch) | |
| tree | 4cdc51b85e5fa77b58d434bb1a0d04b000775239 /tests/vb2_ui_tests.c | |
| parent | 0bbd72df633a90258d8f5203614ef16258c25a00 (diff) | |
| download | vboot-72d4c9dae9c910e2bb5d0fcb8b34771fd4ce16f0.tar.gz | |
vboot: move timer and beep functions to vboot2 namespace
Move these functions from vboot_api.h into 2api.h:
VbExGetTimer --> vb2ex_mtime (usec -> msec)
VbExSleepMs --> vb2ex_msleep
VbExBeep --> vb2ex_beep
Rename the constants:
VB_USEC_PER_MSEC --> VB2_USEC_PER_MSEC
VB_MSEC_PER_SEC --> VB2_MSEC_PER_SEC
Remove the constant VB_USEC_PER_SEC.
The error code VBERROR_NO_BACKGROUND_SOUND is dropped since
it is not currently used.
Update a few printf lines to use VB2_DEBUG instead.
BUG=b:124141368, chromium:988410
TEST=make clean && make runtests
BRANCH=none
Change-Id: I887112ffd5f68fb6a9c4d9ad624aa420cbd55b4b
Signed-off-by: Joel Kitching <kitching@google.com>
Cq-Depend: chromium:2158665
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2158666
Tested-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Diffstat (limited to 'tests/vb2_ui_tests.c')
| -rw-r--r-- | tests/vb2_ui_tests.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/tests/vb2_ui_tests.c b/tests/vb2_ui_tests.c index 13c037c1..6f5ca68b 100644 --- a/tests/vb2_ui_tests.c +++ b/tests/vb2_ui_tests.c @@ -46,9 +46,9 @@ static int mock_key_trusted[64]; static int mock_key_count; static int mock_key_total; -static uint64_t mock_get_timer_last; -static uint64_t mock_time; -static const uint64_t mock_time_start = 31ULL * VB_USEC_PER_SEC; +static uint32_t mock_get_timer_last; +static uint32_t mock_time; +static const uint32_t mock_time_start = 31ULL * VB2_MSEC_PER_SEC; static int mock_vbexbeep_called; static enum vb2_dev_default_boot mock_default_boot; @@ -273,21 +273,20 @@ uint32_t VbExKeyboardReadWithFlags(uint32_t *key_flags) return 0; } -uint64_t VbExGetTimer(void) +uint32_t vb2ex_mtime(void) { mock_get_timer_last = mock_time; return mock_time; } -void VbExSleepMs(uint32_t msec) +void vb2ex_msleep(uint32_t msec) { - mock_time += msec * VB_USEC_PER_MSEC; + mock_time += msec; } -vb2_error_t VbExBeep(uint32_t msec, uint32_t frequency) +void vb2ex_beep(uint32_t msec, uint32_t frequency) { mock_vbexbeep_called++; - return VB2_SUCCESS; } enum vb2_dev_default_boot vb2_get_dev_boot_target(struct vb2_context *c) @@ -349,7 +348,7 @@ static void developer_tests(void) MOCK_IGNORE, MOCK_IGNORE); displayed_no_extra(); TEST_TRUE(mock_get_timer_last - mock_time_start >= - 30 * VB_USEC_PER_SEC, " finished delay"); + 30 * VB2_MSEC_PER_SEC, " finished delay"); TEST_EQ(mock_vbexbeep_called, 2, " beeped twice"); TEST_EQ(mock_vbtlk_count, mock_vbtlk_total, " used up mock_vbtlk"); @@ -364,7 +363,7 @@ static void developer_tests(void) MOCK_IGNORE, MOCK_IGNORE); displayed_no_extra(); TEST_TRUE(mock_get_timer_last - mock_time_start >= - 30 * VB_USEC_PER_SEC, " finished delay"); + 30 * VB2_MSEC_PER_SEC, " finished delay"); TEST_EQ(mock_vbexbeep_called, 2, " beeped twice"); TEST_EQ(mock_vbtlk_count, mock_vbtlk_total, " used up mock_vbtlk"); @@ -377,7 +376,7 @@ static void developer_tests(void) MOCK_IGNORE, MOCK_IGNORE); displayed_no_extra(); TEST_TRUE(mock_get_timer_last - mock_time_start >= - 30 * VB_USEC_PER_SEC, " finished delay"); + 30 * VB2_MSEC_PER_SEC, " finished delay"); TEST_EQ(mock_vbexbeep_called, 2, " beeped twice"); TEST_EQ(mock_vbtlk_count, mock_vbtlk_total, " used up mock_vbtlk"); |