Revert "i.MX28: Enable additional DRAM address bits"

[oweals/u-boot.git] / common / menu.c

diff --git a/common/menu.c b/common/menu.c
index 56439374f7464734440e040ba44214b917f1de87..aa16c9a199d772f7bd9971e401efdb883bf06895 100644 (file)
--- a/common/menu.c
+++ b/common/menu.c
@@ -43,6 +43,7 @@ struct menu_item {
  */
 struct menu {
        struct menu_item *default_item;
+       int timeout;
        char *title;
        int prompt;
        void (*item_data_print)(void *);
@@ -86,10 +87,12 @@ static inline void *menu_item_print(struct menu *m,
                                struct menu_item *item,
                                void *extra)
 {
-       if (!m->item_data_print)
-               printf("%s\n", item->key);
-       else
+       if (!m->item_data_print) {
+               puts(item->key);
+               putc('\n');
+       } else {
                m->item_data_print(item->data);
+       }
 
        return NULL;
 }
@@ -110,14 +113,24 @@ 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.
  */
 static inline void menu_display(struct menu *m)
 {
-       if (m->title)
-               printf("%s:\n", m->title);
+       if (m->title) {
+               puts(m->title);
+               putc('\n');
+       }
+       menu_display_statusline(m);
 
        menu_items_iter(m, menu_item_print, NULL);
 }
@@ -157,14 +170,30 @@ static inline struct menu_item *menu_item_by_key(struct menu *m,
        return menu_items_iter(m, menu_item_key_match, item_key);
 }
 
+/*
+ * Wait for the user to hit a key according to the timeout set for the menu.
+ * Returns 1 if the user hit a key, or 0 if the timeout expired.
+ */
+static inline int menu_interrupted(struct menu *m)
+{
+       if (!m->timeout)
+               return 0;
+
+       if (abortboot(m->timeout/10))
+               return 1;
+
+       return 0;
+}
+
 /*
  * Checks whether or not the default menu item should be used without
- * prompting for a user choice.  If the menu is set to always prompt, return
- * 0. Otherwise, return 1 to indicate we should use the default menu item.
+ * prompting for a user choice. If the menu is set to always prompt, or the
+ * user hits a key during the timeout period, return 0. Otherwise, return 1 to
+ * indicate we should use the default menu item.
  */
 static inline int menu_use_default(struct menu *m)
 {
-       return !m->prompt;
+       return !m->prompt && !menu_interrupted(m);
 }
 
 /*
@@ -201,15 +230,18 @@ static inline int menu_interactive_choice(struct menu *m, void **choice)
 
                menu_display(m);
 
-               readret = readline_into_buffer("Enter choice: ", cbuf);
+               readret = readline_into_buffer("Enter choice: ", cbuf,
+                               m->timeout);
 
                if (readret >= 0) {
                        choice_item = menu_item_by_key(m, cbuf);
 
-                       if (!choice_item)
+                       if (!choice_item) {
                                printf("%s not found\n", cbuf);
+                               m->timeout = 0;
+                       }
                } else {
-                       printf("^C\n");
+                       puts("^C\n");
                        return -EINTR;
                }
        }
@@ -250,7 +282,8 @@ int menu_default_set(struct menu *m, char *item_key)
 
 /*
  * menu_get_choice() - Returns the user's selected menu entry, or the default
- * if the menu is set to not prompt. This is safe to call more than once.
+ * if the menu is set to not prompt or the timeout expires. This is safe to
+ * call more than once.
  *
  * m - Points to a menu created by menu_create().
  *
@@ -259,8 +292,8 @@ int menu_default_set(struct menu *m, char *item_key)
  * written at the location it points to.
  *
  * Returns 1 if successful, -EINVAL if m or choice is NULL, -ENOENT if no
- * default has been set and the menu is set to not prompt, or -EINTR if the
- * user exits the menu via ^c.
+ * default has been set and the menu is set to not prompt or the timeout
+ * expires, or -EINTR if the user exits the menu via ^c.
  */
 int menu_get_choice(struct menu *m, void **choice)
 {
@@ -330,7 +363,12 @@ int menu_item_add(struct menu *m, char *item_key, void *item_data)
  * list of menu items. It will be copied to internal storage, and is safe to
  * discard after passing to menu_create().
  *
- * prompt - If 0, don't ask for user input.
+ * timeout - A delay in seconds to wait for user input. If 0, timeout is
+ * disabled, and the default choice will be returned unless prompt is 1.
+ *
+ * prompt - If 0, don't ask for user input unless there is an interrupted
+ * timeout. If 1, the user will be prompted for input regardless of the value
+ * of timeout.
  *
  * item_data_print - If not NULL, will be called for each item when the menu
  * is displayed, with the pointer to the item's data passed as the argument.
@@ -341,7 +379,7 @@ int menu_item_add(struct menu *m, char *item_key, void *item_data)
  * Returns a pointer to the menu if successful, or NULL if there is
  * insufficient memory available to create the menu.
  */
-struct menu *menu_create(char *title, int prompt,
+struct menu *menu_create(char *title, int timeout, int prompt,
                                void (*item_data_print)(void *))
 {
        struct menu *m;
@@ -353,6 +391,7 @@ struct menu *menu_create(char *title, int prompt,
 
        m->default_item = NULL;
        m->prompt = prompt;
+       m->timeout = timeout;
        m->item_data_print = item_data_print;
 
        if (title) {