ooops... fixed commit gaffe in previous commit.
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Tue, 26 Aug 2008 11:40:59 +0000 (11:40 +0000)
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Tue, 26 Aug 2008 11:40:59 +0000 (11:40 +0000)
git-svn-id: svn://svn.berlios.de/openocd/trunk@971 b42882b7-edfa-0310-969c-e2dbd0fdcd60

src/flash/str9x.c

index 94a2a1cf15e32ca38cc78317386f22a4012520cd..1160c7090a91ca36f2240cfdd0e97c21fca653d6 100644 (file)
@@ -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;