[Openocd-svn] r1911 - trunk/src/flash

[kc8apf at B. <kc...@ma...>]

Author: kc8apf
Date: 2009-05-25 17:51:30 +0200 (Mon, 25 May 2009)
New Revision: 1911

Modified:
   trunk/src/flash/cfi.c
Log:
Author: Ra?\195?\186l S?\195?\161nchez Siles <rsa...@in...>
- cfi flash_address coding style fix


Modified: trunk/src/flash/cfi.c
===================================================================
--- trunk/src/flash/cfi.c	2009-05-24 21:13:29 UTC (rev 1910)
+++ trunk/src/flash/cfi.c	2009-05-25 15:51:30 UTC (rev 1911)
@@ -114,9 +114,11 @@
 {
 	cfi_flash_bank_t *cfi_info = bank->driver_priv;
 
+	if(cfi_info->x16_as_x8) offset*=2;
+
 	/* while the sector list isn't built, only accesses to sector 0 work */
 	if (sector == 0)
-		return bank->base + (offset * bank->bus_width << cfi_info->x16_as_x8 );
+		return bank->base + offset * bank->bus_width;
 	else
 	{
 		if (!bank->sectors)
@@ -124,7 +126,7 @@
 			LOG_ERROR("BUG: sector list not yet built");
 			exit(-1);
 		}
-		return bank->base + bank->sectors[sector].offset + (offset * bank->bus_width << cfi_info->x16_as_x8 );
+		return bank->base + bank->sectors[sector].offset + offset * bank->bus_width;
 	}
 
 }