diff options
| author | wdenk <wdenk> | 2004-04-23 20:32:05 +0000 | 
|---|---|---|
| committer | wdenk <wdenk> | 2004-04-23 20:32:05 +0000 | 
| commit | 5cf91d6bdc3e60bd43f9ba1bbb97a43ee49b2b2d (patch) | |
| tree | 5fe88f0a967da1a8d4f073b27294be5fa939c19d /common/main.c | |
| parent | e35745bb64fae64da3e1fa7f4afe3213287f5908 (diff) | |
| download | olio-uboot-2014.01-5cf91d6bdc3e60bd43f9ba1bbb97a43ee49b2b2d.tar.xz olio-uboot-2014.01-5cf91d6bdc3e60bd43f9ba1bbb97a43ee49b2b2d.zip | |
* Modify KUP4X board configuration to use SL811 driver for USB memoryLABEL_2004_04_23_2240
  sticks (including FAT / VFAT filesystem support)
* Add SL811 Host Controller Interface driver for USB
* Add CFG_I2C_EEPROM_ADDR_OVERFLOW desription to README
* Patch by Pantelis Antoniou, 19 Apr 2004:
  Allow to use shell style syntax (i. e. ${var} ) with standard parser.
  Minor patches for Intracom boards.
* Patch by Christian Pell, 19 Apr 2004:
  cleanup support for CF/IDE on PCMCIA for PXA25X
Diffstat (limited to 'common/main.c')
| -rw-r--r-- | common/main.c | 8 | 
1 files changed, 4 insertions, 4 deletions
| diff --git a/common/main.c b/common/main.c index 7ce9b75f9..0869426f1 100644 --- a/common/main.c +++ b/common/main.c @@ -726,8 +726,8 @@ static void process_macros (const char *input, char *output)  	int inputcnt  = strlen (input);  	int outputcnt = CFG_CBSIZE;  	int state = 0;	/* 0 = waiting for '$'	*/ -			/* 1 = waiting for '('	*/ -			/* 2 = waiting for ')'	*/ +			/* 1 = waiting for '(' or '{' */ +			/* 2 = waiting for ')' or '}' */  			/* 3 = waiting for '''  */  #ifdef DEBUG_PARSER  	char *output_start = output; @@ -765,7 +765,7 @@ static void process_macros (const char *input, char *output)  		}  		break;  	    case 1:			/* Waiting for (	*/ -		if (c == '(') { +		if (c == '(' || c == '{') {  			state++;  			varname_start = input;  		} else { @@ -780,7 +780,7 @@ static void process_macros (const char *input, char *output)  		}  		break;  	    case 2:			/* Waiting for )	*/ -		if (c == ')') { +		if (c == ')' || c == '}') {  			int i;  			char envname[CFG_CBSIZE], *envval;  			int envcnt = input-varname_start-1; /* Varname # of chars */ |