summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-08-26 11:40:59 +0000
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-08-26 11:40:59 +0000
commit113436df6fa0f8638e03b9f63588ce8504290f63 (patch)
treea62a291161f6944f99cd4d5b2dac36b1387a5aec /src
parente5181df1d461980e6faee9c08891ccae901a06f2 (diff)
downloadopenocd+libswd-113436df6fa0f8638e03b9f63588ce8504290f63.tar.gz
openocd+libswd-113436df6fa0f8638e03b9f63588ce8504290f63.tar.bz2
openocd+libswd-113436df6fa0f8638e03b9f63588ce8504290f63.tar.xz
openocd+libswd-113436df6fa0f8638e03b9f63588ce8504290f63.zip
ooops... fixed commit gaffe in previous commit.
git-svn-id: svn://svn.berlios.de/openocd/trunk@971 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src')
-rw-r--r--src/flash/str9x.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/flash/str9x.c b/src/flash/str9x.c
index 94a2a1cf..1160c709 100644
--- a/src/flash/str9x.c
+++ b/src/flash/str9x.c
@@ -306,8 +306,8 @@ int str9x_erase(struct flash_bank_s *bank, int first, int last)
return retval;
}
- int i;
- for (i=0; i<1000; i++) {
+ int timeout;
+ for (timeout=0; timeout<1000; timeout++) {
if ((retval=target_read_u8(target, adr, &status))!=ERROR_OK)
{
return retval;
@@ -316,7 +316,7 @@ int str9x_erase(struct flash_bank_s *bank, int first, int last)
break;
alive_sleep(1);
}
- if (i==1000)
+ if (timeout==1000)
{
LOG_ERROR("erase timed out");
return ERROR_FAIL;
@@ -578,15 +578,15 @@ int str9x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
/* get status command */
target_write_u16(target, bank_adr, 0x70);
- int i;
- for (i=0; i<1000; i++)
+ int timeout;
+ for (timeout=0; timeout<1000; timeout++)
{
target_read_u8(target, bank_adr, &status);
if( status & 0x80 )
break;
alive_sleep(1);
}
- if (i==1000)
+ if (timeout==1000)
{
LOG_ERROR("write timed out");
return ERROR_FAIL;
@@ -627,15 +627,15 @@ int str9x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
/* query status command */
target_write_u16(target, bank_adr, 0x70);
- int i;
- for (i=0; i<1000; i++)
+ int timeout;
+ for (timeout=0; timeout<1000; timeout++)
{
target_read_u8(target, bank_adr, &status);
if( status & 0x80 )
break;
alive_sleep(1);
}
- if (i==1000)
+ if (timeout==1000)
{
LOG_ERROR("write timed out");
return ERROR_FAIL;