Patchwork [U-Boot,1/3] common: add possibility for readline_into_buffer timeout

login
register
mail settings
Submitter Heiko Schocher
Date Jan. 15, 2012, 7:53 a.m.
Message ID <1326614022-24014-2-git-send-email-hs@denx.de>
Download mbox | patch
Permalink /patch/136161/
State Superseded
Headers show

Comments

Heiko Schocher - Jan. 15, 2012, 7:53 a.m.
add possibility to add a timeout when reading a line
into a buffer.

Signed-off-by: Heiko Schocher <hs@denx.de>
---
 common/cmd_nvedit.c |    2 +-
 common/main.c       |   21 +++++++++++++++++----
 common/menu.c       |    3 ++-
 include/common.h    |    3 ++-
 4 files changed, 22 insertions(+), 7 deletions(-)
Mike Frysinger - Jan. 15, 2012, 5:35 p.m.
On Sunday 15 January 2012 02:53:40 Heiko Schocher wrote:
> --- a/common/main.c
> +++ b/common/main.c
>
> +		if ((first) && (timeout)) {

those inner parens make no sense

> +			ulong start = get_timer(0);
> +			ulong delay = timeout * CONFIG_SYS_HZ;

what do you want the timeout to be in ?  milliseconds ?  then make that part 
of the API (add comments to the relevant funcs), and drop the CONFIG_SYS_HZ 
usage.
-mike
Heiko Schocher - Jan. 16, 2012, 6:43 a.m.
Hello Mike,

Mike Frysinger wrote:
> On Sunday 15 January 2012 02:53:40 Heiko Schocher wrote:
>> --- a/common/main.c
>> +++ b/common/main.c
>>
>> +		if ((first) && (timeout)) {
> 
> those inner parens make no sense

Yep, fixed.

>> +			ulong start = get_timer(0);
>> +			ulong delay = timeout * CONFIG_SYS_HZ;
> 
> what do you want the timeout to be in ?  milliseconds ?  then make that part 

seconds, similiar to bootdelay.

> of the API (add comments to the relevant funcs), and drop the CONFIG_SYS_HZ 
> usage.

Fix this (Do it like bootdelay is done, using endticks())

Thanks for the review.

bye,
Heiko

Patch

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index 63afc82..20080dc 100644
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -502,7 +502,7 @@  int do_env_edit(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	else
 		buffer[0] = '\0';
 
-	readline_into_buffer("edit: ", buffer);
+	readline_into_buffer("edit: ", buffer, 0);
 
 	return setenv(argv[1], buffer);
 }
diff --git a/common/main.c b/common/main.c
index e96c95a..08070f3 100644
--- a/common/main.c
+++ b/common/main.c
@@ -685,7 +685,8 @@  static void cread_add_str(char *str, int strsize, int insert, unsigned long *num
 	}
 }
 
-static int cread_line(const char *const prompt, char *buf, unsigned int *len)
+static int cread_line(const char *const prompt, char *buf, unsigned int *len,
+		int timeout)
 {
 	unsigned long num = 0;
 	unsigned long eol_num = 0;
@@ -695,6 +696,7 @@  static int cread_line(const char *const prompt, char *buf, unsigned int *len)
 	int esc_len = 0;
 	char esc_save[8];
 	int init_len = strlen(buf);
+	int first = 1;
 
 	if (init_len)
 		cread_add_str(buf, init_len, 1, &num, &eol_num, buf, *len);
@@ -707,6 +709,17 @@  static int cread_line(const char *const prompt, char *buf, unsigned int *len)
 			WATCHDOG_RESET();
 		}
 #endif
+		if ((first) && (timeout)) {
+			ulong start = get_timer(0);
+			ulong delay = timeout * CONFIG_SYS_HZ;
+
+			while (!tstc()) {	/* while no incoming data */
+				if (get_timer(start) > delay)
+					return -2;	/* timed out */
+				WATCHDOG_RESET();
+			}
+			first = 0;
+		}
 
 		ichar = getcmd_getch();
 
@@ -922,11 +935,11 @@  int readline (const char *const prompt)
 	 */
 	console_buffer[0] = '\0';
 
-	return readline_into_buffer(prompt, console_buffer);
+	return readline_into_buffer(prompt, console_buffer, 0);
 }
 
 
-int readline_into_buffer (const char *const prompt, char * buffer)
+int readline_into_buffer(const char *const prompt, char *buffer, int timeout)
 {
 	char *p = buffer;
 #ifdef CONFIG_CMDLINE_EDITING
@@ -949,7 +962,7 @@  int readline_into_buffer (const char *const prompt, char * buffer)
 		if (prompt)
 			puts (prompt);
 
-		rc = cread_line(prompt, p, &len);
+		rc = cread_line(prompt, p, &len, timeout);
 		return rc < 0 ? rc : len;
 
 	} else {
diff --git a/common/menu.c b/common/menu.c
index 5e0817c..3b1e0d0 100644
--- a/common/menu.c
+++ b/common/menu.c
@@ -222,7 +222,8 @@  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);
diff --git a/include/common.h b/include/common.h
index 3df1def..7a9b3a2 100644
--- a/include/common.h
+++ b/include/common.h
@@ -265,7 +265,8 @@  int	run_command	(const char *cmd, int flag);
 int run_command2(const char *cmd, int flag);
 #endif
 int	readline	(const char *const prompt);
-int	readline_into_buffer	(const char *const prompt, char * buffer);
+int	readline_into_buffer(const char *const prompt, char *buffer,
+			int timeout);
 int	parse_line (char *, char *[]);
 void	init_cmd_timeout(void);
 void	reset_cmd_timeout(void);