From c85a4f1fa4062e69f8ad8d9f4a8d70fe8c32bb82 Mon Sep 17 00:00:00 2001 From: William Wilgus Date: Sat, 17 Dec 2022 03:27:21 -0500 Subject: menus remove reserved 'param' parameter -- missed the plugin menu -- Change-Id: Iac2c9b0b8212ab5f3ac2ef90e1ac2723d212f86c --- apps/menu.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'apps/menu.h') diff --git a/apps/menu.h b/apps/menu.h index acdc8e987f..1f017b0c49 100644 --- a/apps/menu.h +++ b/apps/menu.h @@ -195,8 +195,7 @@ int do_menu(const struct menu_item_ex *menu, int *start_selected, When the user selects this item the function will be run, if MENU_FUNC_CHECK_RETVAL is set, the return value will be checked, returning 1 will exit do_menu(); */ -#define MENUITEM_FUNCTION(name, flags, str, func, reserved, \ - callback, icon) \ +#define MENUITEM_FUNCTION(name, flags, str, func, callback, icon) \ static const struct menu_callback_with_desc name##_ = {callback,str,icon}; \ static const struct menu_func name##__ = {(void*)func}; \ /* should be const, but recording_settings wont let us do that */ \ @@ -205,14 +204,14 @@ int do_menu(const struct menu_item_ex *menu, int *start_selected, { .function = & name##__}, {.callback_and_desc = & name##_}}; /* As above, except the text is dynamic */ -#define MENUITEM_FUNCTION_DYNTEXT(name, flags, func, reserved, \ +#define MENUITEM_FUNCTION_DYNTEXT(name, flags, func, \ text_callback, voice_callback, \ text_cb_data, callback, icon) \ static const struct menu_get_name_and_icon name##_ \ = {callback,text_callback,voice_callback,text_cb_data,icon}; \ static const struct menu_func name##__ = {(void*)func}; \ const struct menu_item_ex name = \ - { MT_FUNCTION_CALL|MENU_DYNAMIC_DESC|flags, \ + { MT_FUNCTION_CALL|MENU_DYNAMIC_DESC|flags, \ { .function = & name##__}, {.menu_get_name_and_icon = & name##_}}; /* Use this to put a function call into the menu. -- cgit v1.2.3