stick to convention of "retval" being used as error value to
be propagated and use "flash_flags" local variable for flash
flags read from how.
Change-Id: I63f1f2248b4f4538d6cd7634ae277f7c0aadc346
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
Reviewed-on: http://openocd.zylin.com/178
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
static int str7x_result(struct flash_bank *bank)
{
struct target *target = bank->target;
static int str7x_result(struct flash_bank *bank)
{
struct target *target = bank->target;
- int err;
- err = target_read_u32(target, str7x_get_flash_adr(bank, FLASH_ER), &retval);
- if (err != ERROR_OK)
- return err;
+ int retval;
+ retval = target_read_u32(target, str7x_get_flash_adr(bank, FLASH_ER), &flash_flags);
+ if (retval != ERROR_OK)
+ return retval;
- if (retval & FLASH_WPF)
+ if (flash_flags & FLASH_WPF)
{
LOG_ERROR("str7x hw write protection set");
{
LOG_ERROR("str7x hw write protection set");
- if (retval & FLASH_RESER)
+ if (flash_flags & FLASH_RESER)
{
LOG_ERROR("str7x suspended program erase not resumed");
{
LOG_ERROR("str7x suspended program erase not resumed");
- if (retval & FLASH_10ER)
+ if (flash_flags & FLASH_10ER)
{
LOG_ERROR("str7x trying to set bit to 1 when it is already 0");
{
LOG_ERROR("str7x trying to set bit to 1 when it is already 0");
- if (retval & FLASH_PGER)
+ if (flash_flags & FLASH_PGER)
{
LOG_ERROR("str7x program error");
{
LOG_ERROR("str7x program error");
- if (retval & FLASH_ERER)
+ if (flash_flags & FLASH_ERER)
{
LOG_ERROR("str7x erase error");
{
LOG_ERROR("str7x erase error");
+ if (retval == ERROR_OK)
- if (retval & FLASH_ERR)
+ if (flash_flags & FLASH_ERR)
{
/* this should always be set if one of the others are set... */
LOG_ERROR("str7x write operation failed / bad setup");
{
/* this should always be set if one of the others are set... */
LOG_ERROR("str7x write operation failed / bad setup");
struct target *target = bank->target;
int i;
struct target *target = bank->target;
int i;
if (bank->target->state != TARGET_HALTED)
{
if (bank->target->state != TARGET_HALTED)
{
return ERROR_TARGET_NOT_HALTED;
}
return ERROR_TARGET_NOT_HALTED;
}
- target_read_u32(target, str7x_get_flash_adr(bank, FLASH_NVWPAR), &retval);
+ int retval;
+ retval = target_read_u32(target, str7x_get_flash_adr(bank, FLASH_NVWPAR), &flash_flags);
+ if (retval != ERROR_OK)
+ return retval;
for (i = 0; i < bank->num_sectors; i++)
{
for (i = 0; i < bank->num_sectors; i++)
{
- if (retval & str7x_info->sector_bits[i])
+ if (flash_flags & str7x_info->sector_bits[i])
bank->sectors[i].is_protected = 0;
else
bank->sectors[i].is_protected = 1;
bank->sectors[i].is_protected = 0;
else
bank->sectors[i].is_protected = 1;