[uClinux-dev] Re: wrong preprocessor directives in linxu-2.0.x/drivers/block/flash.c

Greg Ungerer gerg at snapgear.com
Wed Aug 31 01:29:29 EDT 2005


Hi Harald,

Harald Küthe wrote:
> My compiler/preprocessor (arm-elf-gcc version 2.95.3 20010315 ) does not like (i.e. it uses the wrong code) the two 
> <#elifdef FLASH_16BIT> directives in linux-2.0.x/drivers/block/flash.c

Applied to CVS.

Thanks
Greg



> Heres the diff:
> --- ../a/flash.c.orig	2003-12-03 05:43:06.000000000 +0100
> +++ ../a/flash.c	2005-08-29 12:35:57.000000000 +0200
> @@ -79,7 +79,7 @@
>    #define 	FL_SIZEOF(x)    	((x) << 2)
>    #define 	FLASH_WIDTH 4
>    #define 	FLASH_ERASE_STATE	(0xFFFFFFFFU)
> -#elifdef FLASH_16BIT
> +#elif defined(FLASH_16BIT)
>    #define	FL_SIZEOF(x)		(x)
>    #define 	FLASH_ERASE_STATE	(0xFFFFU)
>    #define 	FLASH_WIDTH 2
> @@ -238,7 +238,7 @@
>  	D6_MASK           = 0x40404040,
>  	D7_MASK           = 0x80808080
>  };
> -#elifdef FLASH_16BIT
> +#elif defined(FLASH_16BIT)
>  /* 16-bit wide Flash-ROM */
>  enum {  unlockAddress1          = 0x555,
>          unlockData1             = 0xAAAA, 
> 
> Regards
> Harald
> 
> _______________________________________________
> uClinux-dev mailing list
> uClinux-dev at uclinux.org
> http://mailman.uclinux.org/mailman/listinfo/uclinux-dev
> This message was resent by uclinux-dev at uclinux.org
> 

-- 
------------------------------------------------------------------------
Greg Ungerer  --  Chief Software Dude       EMAIL:     gerg at snapgear.com
SnapGear -- a CyberGuard Company            PHONE:       +61 7 3435 2888
825 Stanley St,                             FAX:         +61 7 3891 3630
Woolloongabba, QLD, 4102, Australia         WEB: http://www.SnapGear.com



More information about the uClinux-dev mailing list