brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-09-27 23:20:26 +09:00
Code Issues Projects Releases Wiki Activity

Fix CONFIG_CMDLINE_EDITING implementation

Browse Source 
Patch by Stefan Roese, 27 Jul 2006
This commit is contained in:
Stefan Roese 2006-07-27 16:11:19 +02:00
parent 4819fad905
commit 3ca9122fec
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@ -2,6 +2,9 @@
Changes since U-Boot 1.1.4: Changes since U-Boot 1.1.4:
====================================================================== ======================================================================
* Fix CONFIG_CMDLINE_EDITING implementation
Patch by Stefan Roese, 27 Jul 2006
* MCC200: set default configuration to low_boot DDR, * MCC200: set default configuration to low_boot DDR,
and support for configurable options high_boot and/or SDRAM. and support for configurable options high_boot and/or SDRAM.

11
common/main.c
View File

@ -53,7 +53,6 @@ extern int do_bootd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
#define MAX_DELAY_STOP_STR 32 #define MAX_DELAY_STOP_STR 32
static char * delete_char (char *buffer, char *p, int *colp, int *np, int plen);
static int parse_line (char *, char *[]); static int parse_line (char *, char *[]);
#if defined(CONFIG_BOOTDELAY) && (CONFIG_BOOTDELAY >= 0) #if defined(CONFIG_BOOTDELAY) && (CONFIG_BOOTDELAY >= 0)
static int abortboot(int); static int abortboot(int);
@ -63,8 +62,11 @@ static int abortboot(int);
char console_buffer[CFG_CBSIZE]; /* console I/O buffer */ char console_buffer[CFG_CBSIZE]; /* console I/O buffer */
#ifndef CONFIG_CMDLINE_EDITING
static char * delete_char (char *buffer, char *p, int *colp, int *np, int plen);
static char erase_seq[] = "\b \b"; /* erase sequence */ static char erase_seq[] = "\b \b"; /* erase sequence */
static char tab_seq[] = " "; /* used to expand TABs */ static char tab_seq[] = " "; /* used to expand TABs */
#endif /* CONFIG_CMDLINE_EDITING */
#ifdef CONFIG_BOOT_RETRY_TIME #ifdef CONFIG_BOOT_RETRY_TIME
static uint64_t endtime = 0; /* must be set, default is instant timeout */ static uint64_t endtime = 0; /* must be set, default is instant timeout */
@ -641,6 +643,7 @@ static char* hist_next(void)
return (ret); return (ret);
} }
#ifndef CONFIG_CMDLINE_EDITING
static void cread_print_hist_list(void) static void cread_print_hist_list(void)
{ {
int i; int i;
@ -659,6 +662,7 @@ static void cread_print_hist_list(void)
i++; i++;
} }
} }
#endif /* CONFIG_CMDLINE_EDITING */
#define BEGINNING_OF_LINE() { \ #define BEGINNING_OF_LINE() { \
while (num) { \ while (num) { \
@ -942,7 +946,8 @@ int readline (const char *const prompt)
puts (prompt); puts (prompt);
return cread_line(p, &len); cread_line(p, &len);
return len;
#else #else
char *p = console_buffer; char *p = console_buffer;
int n = 0; /* buffer index */ int n = 0; /* buffer index */
@ -1044,6 +1049,7 @@ int readline (const char *const prompt)
/****************************************************************************/ /****************************************************************************/
#ifndef CONFIG_CMDLINE_EDITING
static char * delete_char (char *buffer, char *p, int *colp, int *np, int plen) static char * delete_char (char *buffer, char *p, int *colp, int *np, int plen)
{ {
char *s; char *s;
@ -1073,6 +1079,7 @@ static char * delete_char (char *buffer, char *p, int *colp, int *np, int plen)
(*np)--; (*np)--;
return (p); return (p);
} }
#endif /* CONFIG_CMDLINE_EDITING */
/****************************************************************************/ /****************************************************************************/