diff options
| author | edisonhello <edisonhello@google.com> | 2021-07-29 17:52:49 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-09-14 08:02:58 +0000 |
| commit | 3d7ad1b873803a2be9dd358c6313aa59a2c9b3bc (patch) | |
| tree | 55c3f03d7214f7ca25dbc716c02219c0dcc73426 /firmware/2lib/include/2ui_private.h | |
| parent | c5a482edd53d705c8eb78eb1472eae2105d4c68f (diff) | |
| download | vboot-3d7ad1b873803a2be9dd358c6313aa59a2c9b3bc.tar.gz | |
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>
Diffstat (limited to 'firmware/2lib/include/2ui_private.h')
| -rw-r--r-- | firmware/2lib/include/2ui_private.h | 17 |
1 files changed, 9 insertions, 8 deletions
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); |