From 05b81fcc18c905613ef56e09ca100ef79a6ee5d2 Mon Sep 17 00:00:00 2001 From: Hsuan Ting Chen Date: Thu, 24 Nov 2022 11:14:01 +0800 Subject: 2lib: Remove vb2ex_msleep() This sleep function is only used in depthcharge/ui and can be replaced by calling mdelay() directly. BUG=b:251372002 BRANCH=none TEST=FW_NAME=dojo emerge-cherry depthcharge TEST=(vboot_reference) make run2tests TEST=(depthcharge) make clean-unit-tests && make unit-tests -j TEST=(depthcharge) make clean-screenshot && make test-screenshot -j Cq-Depend: chromium:4054185 Signed-off-by: Hsuan Ting Chen Change-Id: Ib54c72595298090656f8018ac58e0ef68aac1a5f Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/4053907 Reviewed-by: Julius Werner --- firmware/2lib/2stub.c | 5 ----- firmware/2lib/include/2api.h | 8 ++------ 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/firmware/2lib/2stub.c b/firmware/2lib/2stub.c index af8a0a3c..6268f5c8 100644 --- a/firmware/2lib/2stub.c +++ b/firmware/2lib/2stub.c @@ -169,8 +169,3 @@ uint32_t vb2ex_mtime(void) gettimeofday(&tv, NULL); return tv.tv_sec * VB2_MSEC_PER_SEC + tv.tv_usec / VB2_USEC_PER_MSEC; } - -__attribute__((weak)) -void vb2ex_msleep(uint32_t msec) -{ -} diff --git a/firmware/2lib/include/2api.h b/firmware/2lib/include/2api.h index 869d2361..643bc986 100644 --- a/firmware/2lib/include/2api.h +++ b/firmware/2lib/include/2api.h @@ -1346,12 +1346,8 @@ char *vb2api_get_debug_info(struct vb2_context *ctx); */ uint32_t vb2ex_mtime(void); -/** - * Delay for at least the specified number of milliseconds. - * - * @param msec Duration in milliseconds. - */ -void vb2ex_msleep(uint32_t msec); +/*****************************************************************************/ +/* Firmware slot information. */ union vb2_fw_boot_info { uint8_t raw[4]; -- cgit v1.2.1