diff options
| author | Anatolij Gustschin <agust@denx.de> | 2013-03-23 14:52:04 +0000 |
|---|---|---|
| committer | Anatolij Gustschin <agust@denx.de> | 2013-03-29 09:35:34 +0100 |
| commit | 6a3439fdadb7b98e72883b90eb717a04cd748e44 (patch) | |
| tree | 4b40cfc6aa5328cd72557d9d4d95f3720301e7d3 | |
| parent | fc9d64ffcd94c1e22675830eae13956cc4fd822d (diff) | |
| download | blackbird-obmc-uboot-6a3439fdadb7b98e72883b90eb717a04cd748e44.tar.gz blackbird-obmc-uboot-6a3439fdadb7b98e72883b90eb717a04cd748e44.zip | |
menu: export menu_default_choice() function
Checking the default menu item and obtaining its data can
be useful in custom menu code. Export menu_default_choice()
function which serves this purpose.
Signed-off-by: Anatolij Gustschin <agust@denx.de>
| -rw-r--r-- | common/menu.c | 2 | ||||
| -rw-r--r-- | doc/README.menu | 5 | ||||
| -rw-r--r-- | include/menu.h | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/common/menu.c b/common/menu.c index 322b75e62f..64b461abb4 100644 --- a/common/menu.c +++ b/common/menu.c @@ -176,7 +176,7 @@ static inline struct menu_item *menu_item_by_key(struct menu *m, * Set *choice to point to the default item's data, if any default item was * set, and returns 1. If no default item was set, returns -ENOENT. */ -static inline int menu_default_choice(struct menu *m, void **choice) +int menu_default_choice(struct menu *m, void **choice) { if (m->default_item) { *choice = m->default_item->data; diff --git a/doc/README.menu b/doc/README.menu index c9493984ca..a8999cab51 100644 --- a/doc/README.menu +++ b/doc/README.menu @@ -66,6 +66,11 @@ int menu_item_add(struct menu *m, char *item_key, void *item_data); int menu_default_set(struct menu *m, char *item_key); /* + * menu_default_choice() - Set *choice to point to the default item's data + */ +int menu_default_choice(struct menu *m, void **choice); + +/* * menu_get_choice() - Returns the user's selected menu entry, or the * default if the menu is set to not prompt or the timeout expires. */ diff --git a/include/menu.h b/include/menu.h index f4dd5af165..d8200eee83 100644 --- a/include/menu.h +++ b/include/menu.h @@ -29,6 +29,7 @@ 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); |
