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>

7 files changed, 80 insertions, 75 deletions

diff --git a/firmware/2lib/2ui.c b/firmware/2lib/2ui.c
index 9b8a9225..83dcde07 100644
--- a/firmware/2lib/2ui.c
+++ b/firmware/2lib/2ui.c
@@ -25,7 +25,7 @@
  * @param ui		UI context pointer
  * @return VB2_REQUEST_SHUTDOWN if shutdown needed, or VB2_SUCCESS
  */
-vb2_error_t check_shutdown_request(struct vb2_ui_context *ui)
+vb2_error_t vb2_check_shutdown_request(struct vb2_ui_context *ui)
 {
 	uint32_t shutdown_request = VbExIsShutdownRequested();
 
@@ -68,7 +68,7 @@ vb2_error_t check_shutdown_request(struct vb2_ui_context *ui)
 /*****************************************************************************/
 /* Error action functions */
 
-vb2_error_t error_exit_action(struct vb2_ui_context *ui)
+vb2_error_t vb2_error_exit_action(struct vb2_ui_context *ui)
 {
 	/*
 	 * If an error message is currently shown on the screen, any
@@ -85,7 +85,7 @@ vb2_error_t error_exit_action(struct vb2_ui_context *ui)
 /*****************************************************************************/
 /* Menu navigation functions */
 
-const struct vb2_menu *get_menu(struct vb2_ui_context *ui)
+const struct vb2_menu *vb2_get_menu(struct vb2_ui_context *ui)
 {
 	const struct vb2_menu *menu;
 	static const struct vb2_menu empty_menu = {
@@ -100,7 +100,7 @@ const struct vb2_menu *get_menu(struct vb2_ui_context *ui)
 	}
 }
 
-vb2_error_t menu_navigation_action(struct vb2_ui_context *ui)
+vb2_error_t vb2_menu_navigation_action(struct vb2_ui_context *ui)
 {
 	uint32_t key = ui->key;
 
@@ -157,7 +157,7 @@ vb2_error_t vb2_ui_menu_next(struct vb2_ui_context *ui)
 	if (!DETACHABLE && ui->key == VB_BUTTON_VOL_DOWN_SHORT_PRESS)
 		return VB2_SUCCESS;
 
-	menu = get_menu(ui);
+	menu = vb2_get_menu(ui);
 	item = ui->state->selected_item + 1;
 	while (item < menu->num_items &&
 	       VB2_GET_BIT(ui->state->hidden_item_mask, item))
@@ -177,7 +177,7 @@ vb2_error_t vb2_ui_menu_select(struct vb2_ui_context *ui)
 	if (!DETACHABLE && ui->key == VB_BUTTON_POWER_SHORT_PRESS)
 		return VB2_SUCCESS;
 
-	menu = get_menu(ui);
+	menu = vb2_get_menu(ui);
 	if (menu->num_items == 0)
 		return VB2_SUCCESS;
 
@@ -227,7 +227,7 @@ vb2_error_t vb2_ui_screen_back(struct vb2_ui_context *ui)
 
 static vb2_error_t default_screen_init(struct vb2_ui_context *ui)
 {
-	const struct vb2_menu *menu = get_menu(ui);
+	const struct vb2_menu *menu = vb2_get_menu(ui);
 	ui->state->selected_item = 0;
 	if (menu->num_items > 1 && menu->items[0].is_language_select)
 		ui->state->selected_item = 1;
@@ -331,7 +331,7 @@ static vb2_error_t ui_loop_impl(
 		    /* Redraw on a screen request to refresh. */
 		    ui.force_display) {
 
-			menu = get_menu(&ui);
+			menu = vb2_get_menu(&ui);
 			VB2_DEBUG("<%s> menu item <%s>\n",
 				  ui.state->screen->name,
 				  menu->num_items ?
@@ -365,14 +365,14 @@ static vb2_error_t ui_loop_impl(
 		ui.key_trusted = !!(key_flags & VB_KEY_FLAG_TRUSTED_KEYBOARD);
 
 		/* Check for shutdown request. */
-		rv = check_shutdown_request(&ui);
+		rv = vb2_check_shutdown_request(&ui);
 		if (rv && rv != VB2_REQUEST_UI_CONTINUE) {
 			VB2_DEBUG("Shutdown requested!\n");
 			return rv;
 		}
 
 		/* Check if we need to exit an error box. */
-		rv = error_exit_action(&ui);
+		rv = vb2_error_exit_action(&ui);
 		if (rv && rv != VB2_REQUEST_UI_CONTINUE)
 			return rv;
 
@@ -384,7 +384,7 @@ static vb2_error_t ui_loop_impl(
 		}
 
 		/* Run menu navigation action. */
-		rv = menu_navigation_action(&ui);
+		rv = vb2_menu_navigation_action(&ui);
 		if (rv && rv != VB2_REQUEST_UI_CONTINUE)
 			return rv;
 
@@ -404,8 +404,8 @@ static vb2_error_t ui_loop_impl(
 	return VB2_SUCCESS;
 }
 
-vb2_error_t ui_loop(struct vb2_context *ctx, enum vb2_screen root_screen_id,
-		    vb2_error_t (*global_action)(struct vb2_ui_context *ui))
+vb2_error_t vb2_ui_loop(struct vb2_context *ctx, enum vb2_screen root_screen_id,
+			vb2_error_t (*global_action)(struct vb2_ui_context *ui))
 {
 	vb2_error_t rv = ui_loop_impl(ctx, root_screen_id, global_action);
 	if (rv == VB2_REQUEST_UI_EXIT)
@@ -423,7 +423,7 @@ vb2_error_t vb2_developer_menu(struct vb2_context *ctx)
 		VB2_DEBUG("WARNING: Dev boot not allowed; forcing to-norm\n");
 		root_screen_id = VB2_SCREEN_DEVELOPER_TO_NORM;
 	}
-	return ui_loop(ctx, root_screen_id, developer_action);
+	return vb2_ui_loop(ctx, root_screen_id, developer_action);
 }
 
 vb2_error_t developer_action(struct vb2_ui_context *ui)
@@ -455,7 +455,8 @@ vb2_error_t developer_action(struct vb2_ui_context *ui)
 
 vb2_error_t vb2_broken_recovery_menu(struct vb2_context *ctx)
 {
-	return ui_loop(ctx, VB2_SCREEN_RECOVERY_BROKEN, broken_recovery_action);
+	return vb2_ui_loop(ctx, VB2_SCREEN_RECOVERY_BROKEN,
+			   broken_recovery_action);
 }
 
 vb2_error_t broken_recovery_action(struct vb2_ui_context *ui)
@@ -472,7 +473,8 @@ vb2_error_t broken_recovery_action(struct vb2_ui_context *ui)
 
 vb2_error_t vb2_manual_recovery_menu(struct vb2_context *ctx)
 {
-	return ui_loop(ctx, VB2_SCREEN_RECOVERY_SELECT, manual_recovery_action);
+	return vb2_ui_loop(ctx, VB2_SCREEN_RECOVERY_SELECT,
+			   manual_recovery_action);
 }
 
 vb2_error_t manual_recovery_action(struct vb2_ui_context *ui)
@@ -509,5 +511,5 @@ vb2_error_t manual_recovery_action(struct vb2_ui_context *ui)
 
 vb2_error_t vb2_diagnostic_menu(struct vb2_context *ctx)
 {
-	return ui_loop(ctx, VB2_SCREEN_DIAGNOSTICS, NULL);
+	return vb2_ui_loop(ctx, VB2_SCREEN_DIAGNOSTICS, NULL);
 }
diff --git a/firmware/2lib/2ui_screens.c b/firmware/2lib/2ui_screens.c
index d6ee6839..af273d12 100644
--- a/firmware/2lib/2ui_screens.c
+++ b/firmware/2lib/2ui_screens.c
@@ -195,7 +195,7 @@ static vb2_error_t language_select_action(struct vb2_ui_context *ui)
 	return vb2_ui_screen_back(ui);
 }
 
-const struct vb2_menu *get_language_menu(struct vb2_ui_context *ui)
+const struct vb2_menu *vb2_get_language_menu(struct vb2_ui_context *ui)
 {
 	int i;
 	uint32_t num_locales;
@@ -228,7 +228,7 @@ const struct vb2_menu *get_language_menu(struct vb2_ui_context *ui)
 
 static vb2_error_t language_select_init(struct vb2_ui_context *ui)
 {
-	const struct vb2_menu *menu = get_menu(ui);
+	const struct vb2_menu *menu = vb2_get_menu(ui);
 	if (menu->num_items == 0) {
 		VB2_DEBUG("ERROR: No menu items found; "
 			  "rejecting entering language selection screen\n");
@@ -248,7 +248,7 @@ static const struct vb2_screen_info language_select_screen = {
 	.id = VB2_SCREEN_LANGUAGE_SELECT,
 	.name = "Language selection screen",
 	.init = language_select_init,
-	.get_menu = get_language_menu,
+	.get_menu = vb2_get_language_menu,
 };
 
 /******************************************************************************/
@@ -272,7 +272,7 @@ static const struct vb2_screen_info recovery_broken_screen = {
 #define ADVANCED_OPTIONS_ITEM_DEVELOPER_MODE 1
 #define ADVANCED_OPTIONS_ITEM_DEBUG_INFO 2
 
-vb2_error_t advanced_options_init(struct vb2_ui_context *ui)
+vb2_error_t vb2_advanced_options_init(struct vb2_ui_context *ui)
 {
 	ui->state->selected_item = ADVANCED_OPTIONS_ITEM_DEVELOPER_MODE;
 	if (vb2_get_sd(ui->ctx)->flags & VB2_SD_FLAG_DEV_MODE_ENABLED ||
@@ -306,7 +306,7 @@ static const struct vb2_menu_item advanced_options_items[] = {
 static const struct vb2_screen_info advanced_options_screen = {
 	.id = VB2_SCREEN_ADVANCED_OPTIONS,
 	.name = "Advanced options",
-	.init = advanced_options_init,
+	.init = vb2_advanced_options_init,
 	.menu = MENU_ITEMS(advanced_options_items),
 };
 
@@ -943,7 +943,7 @@ static const struct vb2_menu_item developer_select_bootloader_items_after[] = {
 
 static vb2_error_t developer_select_bootloader_init(struct vb2_ui_context *ui)
 {
-	if (get_menu(ui)->num_items == 0)
+	if (vb2_get_menu(ui)->num_items == 0)
 		return set_ui_error_and_go_back(ui, VB2_UI_ERROR_ALTFW_EMPTY);
 	/* Select the first bootloader. */
 	ui->state->selected_item =
diff --git a/firmware/2lib/include/2ui.h b/firmware/2lib/include/2ui.h
index bfb2b8b7..55ff5749 100644
--- a/firmware/2lib/include/2ui.h
+++ b/firmware/2lib/include/2ui.h
@@ -98,7 +98,7 @@ struct vb2_ui_context {
 	uint32_t key;
 	int key_trusted;
 
-	/* For check_shutdown_request. */
+	/* For vb2_check_shutdown_request. */
 	enum vb2_power_button power_button;
 
 	/* For developer mode. */
diff --git a/firmware/2lib/include/2ui_private.h b/firmware/2lib/include/2ui_private.h
index 6ce6cf80..79cdd1b7 100644
--- a/firmware/2lib/include/2ui_private.h
+++ b/firmware/2lib/include/2ui_private.h
@@ -19,19 +19,20 @@
 #define DEV_DELAY_BEEP2_MS (20 * VB2_MSEC_PER_SEC + 500)  /* 20.5 seconds */
 
 /* From 2ui.c */
-vb2_error_t check_shutdown_request(struct vb2_ui_context *ui);
-const struct vb2_menu *get_menu(struct vb2_ui_context *ui);
-vb2_error_t error_exit_action(struct vb2_ui_context *ui);
-vb2_error_t menu_navigation_action(struct vb2_ui_context *ui);
-vb2_error_t ui_loop(struct vb2_context *ctx, enum vb2_screen root_screen_id,
-		    vb2_error_t (*global_action)(struct vb2_ui_context *ui));
+vb2_error_t vb2_check_shutdown_request(struct vb2_ui_context *ui);
+const struct vb2_menu *vb2_get_menu(struct vb2_ui_context *ui);
+vb2_error_t vb2_error_exit_action(struct vb2_ui_context *ui);
+vb2_error_t vb2_menu_navigation_action(struct vb2_ui_context *ui);
+vb2_error_t
+vb2_ui_loop(struct vb2_context *ctx, enum vb2_screen root_screen_id,
+	    vb2_error_t (*global_action)(struct vb2_ui_context *ui));
 vb2_error_t developer_action(struct vb2_ui_context *ui);
 vb2_error_t broken_recovery_action(struct vb2_ui_context *ui);
 vb2_error_t manual_recovery_action(struct vb2_ui_context *ui);
 
 /* From 2ui_screens.c */
-const struct vb2_menu *get_language_menu(struct vb2_ui_context *ui);
-vb2_error_t advanced_options_init(struct vb2_ui_context *ui);
+const struct vb2_menu *vb2_get_language_menu(struct vb2_ui_context *ui);
+vb2_error_t vb2_advanced_options_init(struct vb2_ui_context *ui);
 vb2_error_t recovery_select_init(struct vb2_ui_context *ui);
 vb2_error_t recovery_to_dev_init(struct vb2_ui_context *ui);
 vb2_error_t recovery_to_dev_confirm_action(struct vb2_ui_context *ui);
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");