projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
board_f: Add reset status printing
[oweals/u-boot.git]
/
common
/
menu.c
diff --git
a/common/menu.c
b/common/menu.c
index 94afeb290098dc4b1356496ade659d1985fcd143..0f0a29ac2ee3b44172622ca29e597516e165c432 100644
(file)
--- a/
common/menu.c
+++ b/
common/menu.c
@@
-1,7
+1,6
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright 2010-2011 Calxeda, Inc.
/*
* Copyright 2010-2011 Calxeda, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
*/
#include <common.h>
@@
-105,12
+104,9
@@
static inline void *menu_item_destroy(struct menu *m,
return NULL;
}
return NULL;
}
-
void __
menu_display_statusline(struct menu *m)
+
__weak 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
/*
* Display a menu so the user can make a choice of an item. First display its
@@
-198,13
+194,15
@@
static inline int menu_interactive_choice(struct menu *m, void **choice)
if (!m->item_choice) {
readret = cli_readline_into_buffer("Enter choice: ",
if (!m->item_choice) {
readret = cli_readline_into_buffer("Enter choice: ",
- cbuf,
- m->timeout / 10);
+ cbuf, m->timeout);
if (readret >= 0) {
choice_item = menu_item_by_key(m, cbuf);
if (!choice_item)
printf("%s not found\n", cbuf);
if (readret >= 0) {
choice_item = menu_item_by_key(m, cbuf);
if (!choice_item)
printf("%s not found\n", cbuf);
+ } else if (readret == -1) {
+ printf("<INTERRUPT>\n");
+ return -EINTR;
} else {
return menu_default_choice(m, choice);
}
} else {
return menu_default_choice(m, choice);
}
@@
-350,7
+348,7
@@
int menu_item_add(struct menu *m, char *item_key, void *item_data)
* make it obvious what the key for each entry is.
*
* item_choice - If not NULL, will be called when asking the user to choose an
* make it obvious what the key for each entry is.
*
* item_choice - If not NULL, will be called when asking the user to choose an
- * item. Returns a key string corresponding to the cho
o
sen item or NULL if
+ * item. Returns a key string corresponding to the chosen item or NULL if
* no item has been selected.
*
* item_choice_data - Will be passed as the argument to the item_choice function
* no item has been selected.
*
* item_choice_data - Will be passed as the argument to the item_choice function