leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

menu: fix timeout duration

Browse Source 
For distro-boot, the TIMEOUT directive in the boot script specifies
how long to pause in units of 1/10 sec. [1]

Commit 8594753ba0 ("menu: only timeout when menu is displayed")
corrected this by simply dividing the timeout value by 10 in
menu_interactive_choice().

I see two problems:

 - For example, "TIMEOUT 5" should wait for 0.5 sec, but the current
   implementation cannot handle the granularity of 1/10 sec.
   In fact, it never breaks because "m->timeout / 10" is zero,
   which means no timeout.

 - The menu API is used not only by cmd/pxe.c but also by
   common/autoboot.c .  For the latter case, the unit of the
   timeout value is _second_ because its default is associated
   with CONFIG_BOOTDELAY.

To fix the first issue, use DIV_ROUND_UP() so that the timeout value
is rounded up to the closest integer.

For the second issue, move the division to the boundary between
cmd/pxe.c and common/menu.c .  This is a more desirable place because
the comment of struct pxe_menu says:

 * timeout - time in tenths of a second to wait for a user key-press before
 *           booting the default label.

Then, the comment of menu_create() says:

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

[1] https://www.syslinux.org/wiki/index.php?title=SYSLINUX#TIMEOUT_timeout

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2018-05-24 17:04:57 +09:00 committed by Tom Rini
parent 955575c8dc
commit 86fbad2492
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/pxe.c
View File

@ -1453,8 +1453,8 @@ static struct menu *pxe_menu_to_menu(struct pxe_menu *cfg)
/* /*
* Create a menu and add items for all the labels. * Create a menu and add items for all the labels.
*/ */
m = menu_create(cfg->title, cfg->timeout, cfg->prompt, label_print, m = menu_create(cfg->title, DIV_ROUND_UP(cfg->timeout, 10),
NULL, NULL); cfg->prompt, label_print, NULL, NULL);
if (!m) if (!m)
return NULL; return NULL;

3
common/menu.c
View File

@ -194,8 +194,7 @@ static inline int menu_interactive_choice(struct menu *m, void **choice)
if (!m->item_choice) { if (!m->item_choice) {
readret = cli_readline_into_buffer("Enter choice: ", readret = cli_readline_into_buffer("Enter choice: ",
cbuf, cbuf, m->timeout);
m->timeout / 10);
if (readret >= 0) { if (readret >= 0) {
choice_item = menu_item_by_key(m, cbuf); choice_item = menu_item_by_key(m, cbuf);