V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

hush: Pull out U-Boot prompt display and read functionality 

Pull the code which displays U-Boot prompt and reads the command line
into a separate function. No functional change.

Signed-off-by: Marek Vasut <marex@denx.de>
Reviewed-by: Heiko Schocher <hs@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Marek Vasut 2016-01-27 04:47:54 +01:00 committed by Tom Rini
parent dffceb4b15
commit 13d3046fa3
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
common/cli_hush.c
View File

@ -974,6 +974,20 @@ static inline void setup_prompt_string(int promptmode, char **prompt_str)
}
#endif
#ifdef __U_BOOT__
static int uboot_cli_readline(struct in_str *i)
{
char *prompt;
if (i->promptmode == 1)
prompt = CONFIG_SYS_PROMPT;
else
prompt = CONFIG_SYS_PROMPT_HUSH_PS2;
return cli_readline(prompt);
}
#endif
static void get_user_input(struct in_str *i)
{
#ifndef __U_BOOT__
@ -1003,11 +1017,8 @@ static void get_user_input(struct in_str *i)
bootretry_reset_cmd_timeout();
i->__promptme = 1;
if (i->promptmode == 1) {
n = cli_readline(CONFIG_SYS_PROMPT);
} else {
n = cli_readline(CONFIG_SYS_PROMPT_HUSH_PS2);
}
n = uboot_cli_readline(i);
#ifdef CONFIG_BOOT_RETRY_TIME
if (n == -2) {
puts("\nTimeout waiting for command\n");