Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-03-14 05:46:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

menu: add support to check if menu needs to be reprinted

Browse source 
This patch adds a new callback named need_reprint for menu.
The need_reprint will be called before printing the menu. If the
callback exists and returns FALSE, menu printing will be canceled.

This is very useful if the menu was not changed. It can save time
for serial-based menu to handle more input data.

Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
Reviewed-by: Daniel Golle <daniel@makrotopia.org>
Tested-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Weijie Gao 2024-10-29 17:47:16 +08:00 • committed by Tom Rini
parent ddac69885e
commit ccdd7948e2
5 changed files with 15 additions and 3 deletions

2
boot/pxe_utils.c
View file

@ -1474,7 +1474,7 @@ static struct menu *pxe_menu_to_menu(struct pxe_menu *cfg)
* Create a menu and add items for all the labels.
*/
m = menu_create(cfg->title, DIV_ROUND_UP(cfg->timeout, 10),
cfg->prompt, NULL, label_print, NULL, NULL);
cfg->prompt, NULL, label_print, NULL, NULL, NULL);
if (!m)
return NULL;

2
cmd/bootmenu.c
View file

@ -506,7 +506,7 @@ static enum bootmenu_ret bootmenu_show(int delay)
menu = menu_create(NULL, bootmenu->delay, 1, menu_display_statusline,
bootmenu_print_entry, bootmenu_choice_entry,
bootmenu);
NULL, bootmenu);
if (!menu) {
bootmenu_destroy(bootmenu);
return BOOTMENU_RET_FAIL;

2
cmd/eficonfig.c
View file

@ -443,7 +443,7 @@ efi_status_t eficonfig_process_common(struct efimenu *efi_menu,
efi_menu->menu_desc = menu_desc;
menu = menu_create(NULL, 0, 1, display_statusline, item_data_print,
item_choice, efi_menu);
item_choice, NULL, efi_menu);
if (!menu)
return EFI_INVALID_PARAMETER;

11
common/menu.c
View file

@ -43,6 +43,7 @@ struct menu {
void (*display_statusline)(struct menu *);
void (*item_data_print)(void *);
char *(*item_choice)(void *);
bool (*need_reprint)(void *);
void *item_choice_data;
struct list_head items;
int item_cnt;
@ -117,6 +118,11 @@ static inline void *menu_item_destroy(struct menu *m,
*/
static inline void menu_display(struct menu *m)
{
if (m->need_reprint) {
if (!m->need_reprint(m->item_choice_data))
return;
}
if (m->title) {
puts(m->title);
putc('\n');
@ -362,6 +368,9 @@ int menu_item_add(struct menu *m, char *item_key, void *item_data)
* item. Returns a key string corresponding to the chosen item or NULL if
* no item has been selected.
*
* need_reprint - If not NULL, will be called before printing the menu.
* Returning FALSE means the menu does not need reprint.
*
* item_choice_data - Will be passed as the argument to the item_choice function
*
* Returns a pointer to the menu if successful, or NULL if there is
@ -371,6 +380,7 @@ struct menu *menu_create(char *title, int timeout, int prompt,
void (*display_statusline)(struct menu *),
void (*item_data_print)(void *),
char *(*item_choice)(void *),
bool (*need_reprint)(void *),
void *item_choice_data)
{
struct menu *m;
@ -386,6 +396,7 @@ struct menu *menu_create(char *title, int timeout, int prompt,
m->display_statusline = display_statusline;
m->item_data_print = item_data_print;
m->item_choice = item_choice;
m->need_reprint = need_reprint;
m->item_choice_data = item_choice_data;
m->item_cnt = 0;

1
include/menu.h
View file

@ -13,6 +13,7 @@ struct menu *menu_create(char *title, int timeout, int prompt,
void (*display_statusline)(struct menu *),
void (*item_data_print)(void *),
char *(*item_choice)(void *),
bool (*need_reprint)(void *),
void *item_choice_data);
int menu_default_set(struct menu *m, char *item_key);
int menu_get_choice(struct menu *m, void **choice);