diff options
| author | Tom Rini <trini@ti.com> | 2013-03-31 08:43:12 -0400 | 
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-03-31 08:43:12 -0400 | 
| commit | 5644369450635fa5c2967bee55b1ac41f6e988d0 (patch) | |
| tree | 29c272d5a27389635f37171ad142174fb039b0d8 /include/menu.h | |
| parent | 1d3dea12e21275eab5af1b50ef4a3be89cfffc15 (diff) | |
| parent | d999398822c6d57335677bc4ecc6bea4a569492f (diff) | |
| download | olio-uboot-2014.01-5644369450635fa5c2967bee55b1ac41f6e988d0.tar.xz olio-uboot-2014.01-5644369450635fa5c2967bee55b1ac41f6e988d0.zip | |
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
Diffstat (limited to 'include/menu.h')
| -rw-r--r-- | include/menu.h | 5 | 
1 files changed, 4 insertions, 1 deletions
| diff --git a/include/menu.h b/include/menu.h index 7af5fdb0e..d8200eee8 100644 --- a/include/menu.h +++ b/include/menu.h @@ -21,12 +21,15 @@  struct menu;  struct menu *menu_create(char *title, int timeout, int prompt, -				void (*item_data_print)(void *)); +				void (*item_data_print)(void *), +				char *(*item_choice)(void *), +				void *item_choice_data);  int menu_default_set(struct menu *m, char *item_key);  int menu_get_choice(struct menu *m, void **choice);  int menu_item_add(struct menu *m, char *item_key, void *item_data);  int menu_destroy(struct menu *m);  void menu_display_statusline(struct menu *m); +int menu_default_choice(struct menu *m, void **choice);  #if defined(CONFIG_MENU_SHOW)  int menu_show(int bootdelay); |