From da5c37517ac2e2cfd67fcd9beefad5a97d15697c Mon Sep 17 00:00:00 2001 From: kc8apf Date: Fri, 22 May 2009 17:47:07 +0000 Subject: Author: Raúl Sánchez Siles - Consistently use flash_address MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://svn.berlios.de/openocd/trunk@1884 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/flash/cfi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/flash') diff --git a/src/flash/cfi.c b/src/flash/cfi.c index 0eb44d6b..c51539fe 100644 --- a/src/flash/cfi.c +++ b/src/flash/cfi.c @@ -2129,11 +2129,11 @@ static int cfi_probe(struct flash_bank_s *bank) if (bank->chip_width == 1) { u8 manufacturer, device_id; - if((retval = target_read_u8(target, bank->base + 0x0, &manufacturer)) != ERROR_OK) + if((retval = target_read_u8(target, flash_address(bank, 0, 0x00), &manufacturer)) != ERROR_OK) { return retval; } - if((retval = target_read_u8(target, bank->base + 0x1, &device_id)) != ERROR_OK) + if((retval = target_read_u8(target, flash_address(bank, 0, 0x01), &device_id)) != ERROR_OK) { return retval; } @@ -2142,11 +2142,11 @@ static int cfi_probe(struct flash_bank_s *bank) } else if (bank->chip_width == 2) { - if((retval = target_read_u16(target, bank->base + 0x0, &cfi_info->manufacturer)) != ERROR_OK) + if((retval = target_read_u16(target, flash_address(bank, 0, 0x00), &cfi_info->manufacturer)) != ERROR_OK) { return retval; } - if((retval = target_read_u16(target, bank->base + 0x2, &cfi_info->device_id)) != ERROR_OK) + if((retval = target_read_u16(target, flash_address(bank, 0, 0x02), &cfi_info->device_id)) != ERROR_OK) { return retval; } -- cgit v1.2.3