vboot/ui: Rename UI functions

Prepare for copying UI functions to depthcharge.

Rename UI functions which will be copied to depthcharge in vboot
in order to avoid linking time error after copying the functions.

BUG=b:172339016
TEST=export CC=x86_64-pc-linux-gnu-clang DEBUG=1 DETACHABLE=0; \
     make -j test_setup && make -j runtests
TEST=export CC=x86_64-pc-linux-gnu-clang DEBUG=1 DETACHABLE=1; \
     make -j test_setup && make -j runtests
TEST=Hayato booted into developer mode
BRANCH=none

Change-Id: I840de3121dc2ccd8f6d05ec8a1538c3761f806da
Signed-off-by: edisonhello <edisonhello@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3060558
Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-by: Yu-Ping Wu <yupingso@chromium.org>

3 files changed, 45 insertions, 43 deletions

diff --git a/tests/vb2_ui_action_tests.c b/tests/vb2_ui_action_tests.c
index 514340b4..8c6b7421 100644
--- a/tests/vb2_ui_action_tests.c
+++ b/tests/vb2_ui_action_tests.c
@@ -869,13 +869,13 @@ static void ui_loop_tests(void)
 
 	/* Die if no root screen */
 	reset_common_data();
-	TEST_ABORT(ui_loop(ctx, MOCK_NO_SCREEN, NULL),
+	TEST_ABORT(vb2_ui_loop(ctx, MOCK_NO_SCREEN, NULL),
 		   "die if no root screen");
 	DISPLAYED_NO_EXTRA();
 
 	/* Shutdown if requested */
 	reset_common_data();
-	TEST_EQ(ui_loop(ctx, MOCK_SCREEN_BASE, NULL),
+	TEST_EQ(vb2_ui_loop(ctx, MOCK_SCREEN_BASE, NULL),
 		VB2_REQUEST_SHUTDOWN, "shutdown if requested");
 	TEST_EQ(mock_calls_until_shutdown, 0, "  used up shutdown request");
 	DISPLAYED_EQ("mock_screen_base", MOCK_SCREEN_BASE, MOCK_IGNORE,
@@ -886,7 +886,7 @@ static void ui_loop_tests(void)
 	reset_common_data();
 	mock_calls_until_shutdown = -1;
 	mock_action_countdown_limit = 10;
-	TEST_EQ(ui_loop(ctx, MOCK_SCREEN_ACTION, NULL),
+	TEST_EQ(vb2_ui_loop(ctx, MOCK_SCREEN_ACTION, NULL),
 		VB2_SUCCESS, "screen action");
 	TEST_EQ(mock_action_called, 10, "  action called");
 
@@ -894,13 +894,13 @@ static void ui_loop_tests(void)
 	reset_common_data();
 	mock_calls_until_shutdown = -1;
 	mock_action_countdown_limit = 10;
-	TEST_EQ(ui_loop(ctx, MOCK_SCREEN_BLANK, mock_action_countdown),
+	TEST_EQ(vb2_ui_loop(ctx, MOCK_SCREEN_BLANK, mock_action_countdown),
 		VB2_SUCCESS, "global action");
 	TEST_EQ(mock_action_called, 10, "  action called");
 
 	/* Global action can change screen */
 	reset_common_data();
-	TEST_EQ(ui_loop(ctx, MOCK_SCREEN_BLANK, mock_action_screen_change),
+	TEST_EQ(vb2_ui_loop(ctx, MOCK_SCREEN_BLANK, mock_action_screen_change),
 		VB2_REQUEST_SHUTDOWN, "global action can change screen");
 	DISPLAYED_PASS();
 	DISPLAYED_EQ("change to mock_screen_base", MOCK_SCREEN_BASE,
@@ -918,7 +918,8 @@ static void ui_loop_tests(void)
 		add_mock_keypress(VB_KEY_ENTER);
 		mock_calls_until_shutdown = -1;
 		mock_action_flags |= (1 << i);
-		TEST_EQ(ui_loop(ctx, MOCK_SCREEN_ALL_ACTION, mock_action_flag2),
+		TEST_EQ(vb2_ui_loop(ctx, MOCK_SCREEN_ALL_ACTION,
+				    mock_action_flag2),
 			VB2_SUCCESS, action_interfere_test_names[i]);
 	}
 
@@ -933,7 +934,7 @@ static void ui_loop_tests(void)
 	add_mock_keypress(VB_KEY_UP);
 	add_mock_keypress(VB_KEY_UP);
 	add_mock_keypress(VB_KEY_ENTER);
-	TEST_EQ(ui_loop(ctx, MOCK_SCREEN_MENU, NULL),
+	TEST_EQ(vb2_ui_loop(ctx, MOCK_SCREEN_MENU, NULL),
 		VB2_REQUEST_SHUTDOWN, "KEY_UP, KEY_DOWN, and KEY_ENTER");
 	DISPLAYED_EQ("mock_screen_menu", MOCK_SCREEN_MENU, MOCK_IGNORE, 0,
 		     MOCK_IGNORE);
@@ -965,7 +966,7 @@ static void ui_loop_tests(void)
 		add_mock_keypress(VB_BUTTON_VOL_UP_SHORT_PRESS);
 		add_mock_keypress(VB_BUTTON_VOL_UP_SHORT_PRESS);
 		add_mock_keypress(VB_BUTTON_POWER_SHORT_PRESS);
-		TEST_EQ(ui_loop(ctx, MOCK_SCREEN_MENU, NULL),
+		TEST_EQ(vb2_ui_loop(ctx, MOCK_SCREEN_MENU, NULL),
 			VB2_REQUEST_SHUTDOWN, "DETACHABLE");
 		DISPLAYED_EQ("mock_screen_menu", MOCK_SCREEN_MENU, MOCK_IGNORE,
 			     0, MOCK_IGNORE);
@@ -996,7 +997,7 @@ static void ui_loop_delay_tests(void)
 	/* Sleep for 20 ms each iteration */
 	reset_common_data();
 	mock_calls_until_shutdown = 1;
-	TEST_EQ(ui_loop(ctx, MOCK_SCREEN_BASE, mock_action_msleep),
+	TEST_EQ(vb2_ui_loop(ctx, MOCK_SCREEN_BASE, mock_action_msleep),
 		VB2_REQUEST_SHUTDOWN, "  sleep for 20 ms in each iteration");
 	TEST_EQ(mock_time_ms - mock_time_start_ms, KEY_DELAY_MS,
 		"  delay 20 ms in total");
@@ -1005,7 +1006,7 @@ static void ui_loop_delay_tests(void)
 	reset_common_data();
 	mock_calls_until_shutdown = 1;
 	mock_action_delay_ms = KEY_DELAY_MS / 2;
-	TEST_EQ(ui_loop(ctx, MOCK_SCREEN_BASE, mock_action_msleep),
+	TEST_EQ(vb2_ui_loop(ctx, MOCK_SCREEN_BASE, mock_action_msleep),
 		VB2_REQUEST_SHUTDOWN, "  complement to 20 ms");
 	TEST_EQ(mock_time_ms - mock_time_start_ms, KEY_DELAY_MS,
 		"  delay 10 ms in total");
@@ -1014,7 +1015,7 @@ static void ui_loop_delay_tests(void)
 	reset_common_data();
 	mock_calls_until_shutdown = 1;
 	mock_action_delay_ms = 1234;
-	TEST_EQ(ui_loop(ctx, MOCK_SCREEN_BASE, mock_action_msleep),
+	TEST_EQ(vb2_ui_loop(ctx, MOCK_SCREEN_BASE, mock_action_msleep),
 		VB2_REQUEST_SHUTDOWN, "  no extra sleep time");
 	TEST_EQ(mock_time_ms - mock_time_start_ms, mock_action_delay_ms,
 		"  no extra delay");
@@ -1023,7 +1024,7 @@ static void ui_loop_delay_tests(void)
 	reset_common_data();
 	mock_calls_until_shutdown = 1;
 	mock_time_ms = UINT32_MAX;
-	TEST_EQ(ui_loop(ctx, MOCK_SCREEN_BASE, mock_action_msleep),
+	TEST_EQ(vb2_ui_loop(ctx, MOCK_SCREEN_BASE, mock_action_msleep),
 		VB2_REQUEST_SHUTDOWN, "  integer overflow #1");
 	TEST_EQ(mock_time_ms - UINT32_MAX, KEY_DELAY_MS,
 		"  delay 20 ms in total");
@@ -1032,7 +1033,7 @@ static void ui_loop_delay_tests(void)
 	mock_calls_until_shutdown = 1;
 	mock_time_ms = UINT32_MAX;
 	mock_action_delay_ms = KEY_DELAY_MS / 2;
-	TEST_EQ(ui_loop(ctx, MOCK_SCREEN_BASE, mock_action_msleep),
+	TEST_EQ(vb2_ui_loop(ctx, MOCK_SCREEN_BASE, mock_action_msleep),
 		VB2_REQUEST_SHUTDOWN, "  integer overflow #2");
 	TEST_EQ(mock_time_ms - UINT32_MAX, KEY_DELAY_MS,
 		"  delay 10 ms in total");
@@ -1041,7 +1042,7 @@ static void ui_loop_delay_tests(void)
 	mock_calls_until_shutdown = 1;
 	mock_time_ms = UINT32_MAX;
 	mock_action_delay_ms = 1234;
-	TEST_EQ(ui_loop(ctx, MOCK_SCREEN_BASE, mock_action_msleep),
+	TEST_EQ(vb2_ui_loop(ctx, MOCK_SCREEN_BASE, mock_action_msleep),
 		VB2_REQUEST_SHUTDOWN, "  integer overflow #3");
 	TEST_EQ(mock_time_ms - UINT32_MAX, mock_action_delay_ms,
 		"  no extra delay");
diff --git a/tests/vb2_ui_tests.c b/tests/vb2_ui_tests.c
index 948c6af5..e8488304 100644
--- a/tests/vb2_ui_tests.c
+++ b/tests/vb2_ui_tests.c
@@ -594,7 +594,7 @@ static void developer_tests(void)
 	/* Don't proceed to internal disk after timeout (dev mode disallowed) */
 	reset_common_data(FOR_DEVELOPER);
 	ctx->flags &= ~(uint64_t)VB2_CONTEXT_DEV_BOOT_ALLOWED;
-	TEST_EQ(ui_loop(ctx, VB2_SCREEN_DEVELOPER_MODE, NULL),
+	TEST_EQ(vb2_ui_loop(ctx, VB2_SCREEN_DEVELOPER_MODE, NULL),
 		VB2_REQUEST_SHUTDOWN,
 		"do not proceed to internal disk after timeout "
 		"(dev mode disallowed)");
@@ -693,7 +693,7 @@ static void developer_tests(void)
 	reset_common_data(FOR_DEVELOPER);
 	ctx->flags &= ~(uint64_t)VB2_CONTEXT_DEV_BOOT_ALLOWED;
 	mock_default_boot = VB2_DEV_DEFAULT_BOOT_TARGET_EXTERNAL;
-	TEST_EQ(ui_loop(ctx, VB2_SCREEN_DEVELOPER_MODE, NULL),
+	TEST_EQ(vb2_ui_loop(ctx, VB2_SCREEN_DEVELOPER_MODE, NULL),
 		VB2_REQUEST_SHUTDOWN,
 		"do not proceed to external disk after timeout "
 		"(dev mode disallowed)");
@@ -754,7 +754,7 @@ static void developer_tests(void)
 	add_mock_keypress(VB_KEY_UP);
 	add_mock_keypress(VB_KEY_ENTER);
 	add_mock_keypress(VB_KEY_ENTER);
-	TEST_EQ(ui_loop(ctx, VB2_SCREEN_DEVELOPER_MODE, NULL),
+	TEST_EQ(vb2_ui_loop(ctx, VB2_SCREEN_DEVELOPER_MODE, NULL),
 		VB2_REQUEST_REBOOT,
 		"select to_norm in dev menu and confirm (dev mode disallowed)");
 	TEST_EQ(vb2_nv_get(ctx, VB2_NV_DISABLE_DEV_REQUEST), 1,
diff --git a/tests/vb2_ui_utility_tests.c b/tests/vb2_ui_utility_tests.c
index 1a7b19ea..b37b8e0f 100644
--- a/tests/vb2_ui_utility_tests.c
+++ b/tests/vb2_ui_utility_tests.c
@@ -165,21 +165,21 @@ const struct vb2_screen_info *vb2_get_screen_info(enum vb2_screen screen)
 /* Tests */
 static void check_shutdown_request_tests(void)
 {
-	VB2_DEBUG("Testing check_shutdown_request...\n");
+	VB2_DEBUG("Testing vb2_check_shutdown_request...\n");
 
 	/* Release, press, hold, and release */
 	if (!DETACHABLE) {
 		reset_common_data();
 		mock_shutdown_request = 0;
-		TEST_EQ(check_shutdown_request(&mock_ui_context), VB2_SUCCESS,
-			"release, press, hold, and release");
+		TEST_EQ(vb2_check_shutdown_request(&mock_ui_context),
+			VB2_SUCCESS, "release, press, hold, and release");
 		mock_shutdown_request = VB_SHUTDOWN_REQUEST_POWER_BUTTON;
-		TEST_EQ(check_shutdown_request(&mock_ui_context), VB2_SUCCESS,
-			"  press");
-		TEST_EQ(check_shutdown_request(&mock_ui_context), VB2_SUCCESS,
-			"  hold");
+		TEST_EQ(vb2_check_shutdown_request(&mock_ui_context),
+			VB2_SUCCESS, "  press");
+		TEST_EQ(vb2_check_shutdown_request(&mock_ui_context),
+			VB2_SUCCESS, "  hold");
 		mock_shutdown_request = 0;
-		TEST_EQ(check_shutdown_request(&mock_ui_context),
+		TEST_EQ(vb2_check_shutdown_request(&mock_ui_context),
 			VB2_REQUEST_SHUTDOWN, "  release");
 	}
 
@@ -187,8 +187,8 @@ static void check_shutdown_request_tests(void)
 	if (!DETACHABLE) {
 		reset_common_data();
 		mock_shutdown_request = VB_SHUTDOWN_REQUEST_POWER_BUTTON;
-		TEST_EQ(check_shutdown_request(&mock_ui_context), VB2_SUCCESS,
-			"press is ignored");
+		TEST_EQ(vb2_check_shutdown_request(&mock_ui_context),
+			VB2_SUCCESS, "press is ignored");
 	}
 
 	/* Power button short press from key */
@@ -196,32 +196,32 @@ static void check_shutdown_request_tests(void)
 		reset_common_data();
 		mock_shutdown_request = 0;
 		mock_ui_context.key = VB_BUTTON_POWER_SHORT_PRESS;
-		TEST_EQ(check_shutdown_request(&mock_ui_context),
+		TEST_EQ(vb2_check_shutdown_request(&mock_ui_context),
 			VB2_REQUEST_SHUTDOWN, "power button short press");
 	}
 
 	/* Lid closure = shutdown request anyway */
 	reset_common_data();
 	mock_shutdown_request = VB_SHUTDOWN_REQUEST_LID_CLOSED;
-	TEST_EQ(check_shutdown_request(&mock_ui_context),
+	TEST_EQ(vb2_check_shutdown_request(&mock_ui_context),
 		VB2_REQUEST_SHUTDOWN, "lid closure");
 	mock_ui_context.key = 'A';
-	TEST_EQ(check_shutdown_request(&mock_ui_context),
+	TEST_EQ(vb2_check_shutdown_request(&mock_ui_context),
 		VB2_REQUEST_SHUTDOWN, "  lidsw + random key");
 
 	/* Lid ignored by GBB flags */
 	reset_common_data();
 	gbb.flags |= VB2_GBB_FLAG_DISABLE_LID_SHUTDOWN;
 	mock_shutdown_request = VB_SHUTDOWN_REQUEST_LID_CLOSED;
-	TEST_EQ(check_shutdown_request(&mock_ui_context), VB2_SUCCESS,
+	TEST_EQ(vb2_check_shutdown_request(&mock_ui_context), VB2_SUCCESS,
 		"lid ignored");
 	if (!DETACHABLE) {  /* Power button works for non DETACHABLE */
 		mock_shutdown_request = VB_SHUTDOWN_REQUEST_LID_CLOSED |
 					VB_SHUTDOWN_REQUEST_POWER_BUTTON;
-		TEST_EQ(check_shutdown_request(&mock_ui_context), VB2_SUCCESS,
-			"  lidsw + pwdsw");
+		TEST_EQ(vb2_check_shutdown_request(&mock_ui_context),
+			VB2_SUCCESS, "  lidsw + pwdsw");
 		mock_shutdown_request = 0;
-		TEST_EQ(check_shutdown_request(&mock_ui_context),
+		TEST_EQ(vb2_check_shutdown_request(&mock_ui_context),
 			VB2_REQUEST_SHUTDOWN, "  pwdsw release");
 	}
 
@@ -231,7 +231,7 @@ static void check_shutdown_request_tests(void)
 		gbb.flags |= VB2_GBB_FLAG_DISABLE_LID_SHUTDOWN;
 		mock_shutdown_request = VB_SHUTDOWN_REQUEST_LID_CLOSED;
 		mock_ui_context.key = VB_BUTTON_POWER_SHORT_PRESS;
-		TEST_EQ(check_shutdown_request(&mock_ui_context),
+		TEST_EQ(vb2_check_shutdown_request(&mock_ui_context),
 			VB2_REQUEST_SHUTDOWN,
 			"lid ignored; power button short pressed");
 	}
@@ -241,17 +241,18 @@ static void check_shutdown_request_tests(void)
 		/* Flag pwdsw */
 		reset_common_data();
 		mock_shutdown_request = VB_SHUTDOWN_REQUEST_POWER_BUTTON;
-		TEST_EQ(check_shutdown_request(&mock_ui_context), VB2_SUCCESS,
-			"DETACHABLE: ignore pwdsw");
+		TEST_EQ(vb2_check_shutdown_request(&mock_ui_context),
+			VB2_SUCCESS, "DETACHABLE: ignore pwdsw");
 		mock_shutdown_request = 0;
-		TEST_EQ(check_shutdown_request(&mock_ui_context), VB2_SUCCESS,
-			"  ignore on release");
+		TEST_EQ(vb2_check_shutdown_request(&mock_ui_context),
+			VB2_SUCCESS, "  ignore on release");
 
 		/* Power button short press */
 		reset_common_data();
 		mock_shutdown_request = 0;
 		mock_ui_context.key = VB_BUTTON_POWER_SHORT_PRESS;
-		TEST_EQ(check_shutdown_request(&mock_ui_context), VB2_SUCCESS,
+		TEST_EQ(vb2_check_shutdown_request(&mock_ui_context),
+			VB2_SUCCESS,
 			"DETACHABLE: ignore power button short press");
 	}
 
@@ -344,13 +345,13 @@ static void get_language_menu_tests(void)
 	/* Only allocate menu items once */
 	reset_common_data();
 	mock_locale_count = 7;
-	menu = get_language_menu(&mock_ui_context);
+	menu = vb2_get_language_menu(&mock_ui_context);
 	TEST_PTR_NEQ(menu, NULL, "get language menu");
 	TEST_EQ(menu->num_items, 7, "  correct locale count");
 	TEST_PTR_NEQ(menu->items, NULL, "  items not null");
 	items = menu->items;
 
-	menu = get_language_menu(&mock_ui_context);
+	menu = vb2_get_language_menu(&mock_ui_context);
 	TEST_PTR_NEQ(menu, NULL, "get language menu again");
 	TEST_EQ(menu->num_items, 7, "  correct locale count again");
 	TEST_PTR_EQ(menu->items, items, "  same pointer of items");
@@ -358,7 +359,7 @@ static void get_language_menu_tests(void)
 	/* Locale count = 0 */
 	reset_common_data();
 	mock_locale_count = 0;
-	menu = get_language_menu(&mock_ui_context);
+	menu = vb2_get_language_menu(&mock_ui_context);
 	TEST_PTR_NEQ(menu, NULL, "menu not null");
 	TEST_EQ(menu->num_items, 1, "  locale count 1");