diff mbox

[U-Boot,2/3,v2] common, menu: add statusline support

Message ID 1326784400-4810-1-git-send-email-hs@denx.de
State Accepted, archived
Commit e0611dd97bb38ba341b3479974eb2a3271de380e
Delegated to: Tom Rini
Headers show

Commit Message

Heiko Schocher Jan. 17, 2012, 7:13 a.m. UTC 
add the possibility to show a statusline when printing a menu

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Jason Hobbs <jason.hobbs@calxeda.com>
Cc: Mike Frysinger <vapier@gentoo.org>

---
- changes for v2:
  - add comments from Mike Frysinger <vapier@gentoo.org>:
    - add a prototype for the new function menu_display_statusline
      in menu.h and document it in doc/README.menu

 common/menu.c   |    8 ++++++++
 doc/README.menu |    5 +++++
 include/menu.h  |    1 +
 3 files changed, 14 insertions(+), 0 deletions(-)

Comments

Mike Frysinger Jan. 17, 2012, 7:14 p.m. UTC | #1 
Acked-by: Mike Frysinger <vapier@gentoo.org>
-mike
diff mbox

Patch

diff --git a/common/menu.c b/common/menu.c
index 3b1e0d0..754a9f9 100644
--- a/common/menu.c
+++ b/common/menu.c
@@ -113,6 +113,13 @@  static inline void *menu_item_destroy(struct menu *m,
 	return NULL;
 }
 
+void __menu_display_statusline(struct menu *m)
+{
+	return;
+}
+void menu_display_statusline(struct menu *m)
+	__attribute__ ((weak, alias("__menu_display_statusline")));
+
 /*
  * Display a menu so the user can make a choice of an item. First display its
  * title, if any, and then each item in the menu.
@@ -123,6 +130,7 @@  static inline void menu_display(struct menu *m)
 		puts(m->title);
 		putc('\n');
 	}
+	menu_display_statusline(m);
 
 	menu_items_iter(m, menu_item_print, NULL);
 }
diff --git a/doc/README.menu b/doc/README.menu
index 0dad6a2..4ddf914 100644
--- a/doc/README.menu
+++ b/doc/README.menu
@@ -69,6 +69,11 @@  int menu_get_choice(struct menu *m, void **choice);
  */
 int menu_destroy(struct menu *m);
 
+/*
+ * menu_display_statusline(struct menu *m);
+ * shows a statusline for every menu_display call.
+ */
+void menu_display_statusline(struct menu *m);
 
 Example Code
 ------------
diff --git a/include/menu.h b/include/menu.h
index cf14a9c..b806a02 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -26,5 +26,6 @@  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);
 
 #endif /* __MENU_H__ */