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

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

Author: kc8apf
Date: 2009-05-22 19:48:26 +0200 (Fri, 22 May 2009)
New Revision: 1885

Modified:
   trunk/src/flash/cfi.c
Log:
Author: Ra?\195?\186l S?\195?\161nchez Siles <rsa...@in...>
	- Fix calculation of flash_address for x16 devices used as x8


Modified: trunk/src/flash/cfi.c
===================================================================
--- trunk/src/flash/cfi.c	2009-05-22 17:47:07 UTC (rev 1884)
+++ trunk/src/flash/cfi.c	2009-05-22 17:48:26 UTC (rev 1885)
@@ -112,9 +112,11 @@
 /* inline u32 flash_address(flash_bank_t *bank, int sector, u32 offset) */
 static __inline__ u32 flash_address(flash_bank_t *bank, int sector, u32 offset)
 {
+	cfi_flash_bank_t *cfi_info = bank->driver_priv;
+
 	/* while the sector list isn't built, only accesses to sector 0 work */
 	if (sector == 0)
-		return bank->base + offset * bank->bus_width;
+		return bank->base + (offset * bank->bus_width << cfi_info->x16_as_x8 );
 	else
 	{
 		if (!bank->sectors)
@@ -122,7 +124,7 @@
 			LOG_ERROR("BUG: sector list not yet built");
 			exit(-1);
 		}
-		return bank->base + bank->sectors[sector].offset + offset * bank->bus_width;
+		return bank->base + bank->sectors[sector].offset + (offset * bank->bus_width << cfi_info->x16_as_x8 );
 	}
 
 }