From 13d3046fa392625f172d55cba8eb551f47e45f3f Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Wed, 27 Jan 2016 04:47:54 +0100 Subject: [PATCH] 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 Reviewed-by: Heiko Schocher Reviewed-by: Simon Glass --- common/cli_hush.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/common/cli_hush.c b/common/cli_hush.c index 2fbfdbe89a..cbaf22e912 100644 --- a/common/cli_hush.c +++ b/common/cli_hush.c @@ -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"); -- 2.39.5