Zach Welch <zw@superlucidity.net> fix str9x type-punned pointer
git-svn-id: svn://svn.berlios.de/openocd/trunk@1484 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
parent
713854f714
commit
40b806bfe7
|
@ -194,6 +194,7 @@ static int str9x_protect_check(struct flash_bank_s *bank)
|
||||||
int i;
|
int i;
|
||||||
u32 adr;
|
u32 adr;
|
||||||
u32 status = 0;
|
u32 status = 0;
|
||||||
|
u16 hstatus = 0;
|
||||||
|
|
||||||
if (bank->target->state != TARGET_HALTED)
|
if (bank->target->state != TARGET_HALTED)
|
||||||
{
|
{
|
||||||
|
@ -212,10 +213,11 @@ static int str9x_protect_check(struct flash_bank_s *bank)
|
||||||
{
|
{
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
if ((retval=target_read_u16(target, adr, (u16*)&status))!=ERROR_OK)
|
if ((retval=target_read_u16(target, adr, &hstatus))!=ERROR_OK)
|
||||||
{
|
{
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
status = hstatus;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -237,10 +239,11 @@ static int str9x_protect_check(struct flash_bank_s *bank)
|
||||||
{
|
{
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
if ((retval=target_read_u16(target, adr, (u16*)&status))!=ERROR_OK)
|
if ((retval=target_read_u16(target, adr, &hstatus))!=ERROR_OK)
|
||||||
{
|
{
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
status = hstatus;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* read array command */
|
/* read array command */
|
||||||
|
|
Loading…
Reference in New Issue