diff options
| author | Joel Kitching <kitching@google.com> | 2020-09-24 17:11:49 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-10-05 10:42:11 +0000 |
| commit | a8dd21bf2f94be2463338d66b97105aeb7a6cdc6 (patch) | |
| tree | 3aa973fb1cee82553491346fa66556995659f57b | |
| parent | 9c9f616ec70672590477fcd2f23fb050dfa8eb48 (diff) | |
| download | vboot-a8dd21bf2f94be2463338d66b97105aeb7a6cdc6.tar.gz | |
vboot/ui: introduce casts around vb2_menu_item helpers
Follow same style as MENU_ITEMS macro for clarity and safety.
BUG=b:146399181
TEST=make clean && make runtests
BRANCH=none
Signed-off-by: Joel Kitching <kitching@google.com>
Change-Id: I9aac27dca763c98fd5ca7e35219163d990c73ab0
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2428202
Tested-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-by: Hsuan Ting Chen <roccochen@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
| -rw-r--r-- | firmware/2lib/2ui_screens.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/firmware/2lib/2ui_screens.c b/firmware/2lib/2ui_screens.c index d0e44ee1..558aff40 100644 --- a/firmware/2lib/2ui_screens.c +++ b/firmware/2lib/2ui_screens.c @@ -19,26 +19,26 @@ .items = a, \ }) -#define LANGUAGE_SELECT_ITEM { \ +#define LANGUAGE_SELECT_ITEM ((struct vb2_menu_item){ \ .text = "Language selection", \ .target = VB2_SCREEN_LANGUAGE_SELECT, \ .is_language_select = 1, \ -} +}) -#define NEXT_ITEM(target_screen) { \ +#define NEXT_ITEM(target_screen) ((struct vb2_menu_item){ \ .text = "Next", \ .target = (target_screen), \ -} +}) -#define BACK_ITEM { \ +#define BACK_ITEM ((struct vb2_menu_item){ \ .text = "Back", \ .action = vb2_ui_screen_back, \ -} +}) -#define ADVANCED_OPTIONS_ITEM { \ +#define ADVANCED_OPTIONS_ITEM ((struct vb2_menu_item){ \ .text = "Advanced options", \ .target = VB2_SCREEN_ADVANCED_OPTIONS, \ -} +}) /* Action that will power off the device. */ static vb2_error_t power_off_action(struct vb2_ui_context *ui) @@ -46,10 +46,10 @@ static vb2_error_t power_off_action(struct vb2_ui_context *ui) return VB2_REQUEST_SHUTDOWN; } -#define POWER_OFF_ITEM { \ +#define POWER_OFF_ITEM ((struct vb2_menu_item){ \ .text = "Power off", \ .action = power_off_action, \ -} +}) /******************************************************************************/ /* Functions used for log screens */ |