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

common: add possibility for readline_into_buffer timeout 

add possibility to add a timeout when reading a line
into a buffer.

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Mike Frysinger <vapier@gentoo.org>
Acked-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Heiko Schocher 2012-01-16 21:13:05 +00:00 committed by Albert ARIBAUD
parent 2627c8c0a1
commit 9c3483113d
4 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/cmd_nvedit.c
View File

@ -502,7 +502,7 @@ int do_env_edit(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
else else
buffer[0] = '\0'; buffer[0] = '\0';
readline_into_buffer("edit: ", buffer); readline_into_buffer("edit: ", buffer, 0);
return setenv(argv[1], buffer); return setenv(argv[1], buffer);
} }

20
common/main.c
View File

@ -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 num = 0;
unsigned long eol_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; int esc_len = 0;
char esc_save[8]; char esc_save[8];
int init_len = strlen(buf); int init_len = strlen(buf);
int first = 1;
if (init_len) if (init_len)
cread_add_str(buf, init_len, 1, &num, &eol_num, buf, *len); cread_add_str(buf, init_len, 1, &num, &eol_num, buf, *len);
@ -707,6 +709,16 @@ static int cread_line(const char *const prompt, char *buf, unsigned int *len)
WATCHDOG_RESET(); WATCHDOG_RESET();
} }
#endif #endif
if (first && timeout) {
uint64_t etime = endtick(timeout);
while (!tstc()) { /* while no incoming data */
if (get_ticks() >= etime)
return -2; /* timed out */
WATCHDOG_RESET();
}
first = 0;
}
ichar = getcmd_getch(); ichar = getcmd_getch();
@ -922,11 +934,11 @@ int readline (const char *const prompt)
*/ */
console_buffer[0] = '\0'; 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; char *p = buffer;
#ifdef CONFIG_CMDLINE_EDITING #ifdef CONFIG_CMDLINE_EDITING
@ -949,7 +961,7 @@ int readline_into_buffer (const char *const prompt, char * buffer)
if (prompt) if (prompt)
puts (prompt); puts (prompt);
rc = cread_line(prompt, p, &len); rc = cread_line(prompt, p, &len, timeout);
return rc < 0 ? rc : len; return rc < 0 ? rc : len;
} else { } else {

3
common/menu.c
View File

@ -222,7 +222,8 @@ static inline int menu_interactive_choice(struct menu *m, void **choice)
menu_display(m); menu_display(m);
readret = readline_into_buffer("Enter choice: ", cbuf); readret = readline_into_buffer("Enter choice: ", cbuf,
m->timeout);
if (readret >= 0) { if (readret >= 0) {
choice_item = menu_item_by_key(m, cbuf); choice_item = menu_item_by_key(m, cbuf);

3
include/common.h
View File

@ -265,7 +265,8 @@ int run_command (const char *cmd, int flag);
int run_command2(const char *cmd, int flag); int run_command2(const char *cmd, int flag);
#endif #endif
int readline (const char *const prompt); 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 *[]); int parse_line (char *, char *[]);
void init_cmd_timeout(void); void init_cmd_timeout(void);
void reset_cmd_timeout(void); void reset_cmd_timeout(void);