From: Anatolij Gustschin <agust@denx.de>
Date: Sat, 23 Mar 2013 14:52:04 +0000 (+0000)
Subject: menu: export menu_default_choice() function
X-Git-Tag: v2013.04-rc2~11^2~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6a3439fdadb7b98e72883b90eb717a04cd748e44;p=oweals%2Fu-boot.git

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>
---

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
@@ -65,6 +65,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);