Author: Raúl Sánchez Siles <rsanchezs@infoglobal.es>

- cfi flash_address coding style fix


git-svn-id: svn://svn.berlios.de/openocd/trunk@1911 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
kc8apf 2009-05-25 15:51:30 +00:00
parent ad8f1b4295
commit 3c27bc8774
1 changed files with 4 additions and 2 deletions

View File

@ -114,9 +114,11 @@ static __inline__ u32 flash_address(flash_bank_t *bank, int sector, u32 offset)
{
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 @@ static __inline__ u32 flash_address(flash_bank_t *bank, int sector, u32 offset)
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;
}
}