avr
/
avrdude
mirror of https://github.com/mariusgreuel/avrdude.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

avrftdi.c: Fix wrong loop invariant in write_flush() 

git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1152 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
Hannes Weisbach 2013-05-02 11:07:07 +00:00
parent 6a4d3d3964
commit e9944c32c0
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
avrftdi.c
View File

@ -650,26 +650,19 @@ static int write_flush(avrftdi_t* pdata)
//E(ftdi_usb_purge_buffers(pdata->ftdic), pdata->ftdic); //E(ftdi_usb_purge_buffers(pdata->ftdic), pdata->ftdic);
unsigned char cmd[] = { GET_BITS_LOW, SEND_IMMEDIATE }; unsigned char cmd[] = { GET_BITS_LOW, SEND_IMMEDIATE };
unsigned int n;
int retries = 0;
int num = 0;
E(ftdi_write_data(pdata->ftdic, cmd, sizeof(cmd)) != sizeof(cmd), pdata->ftdic); E(ftdi_write_data(pdata->ftdic, cmd, sizeof(cmd)) != sizeof(cmd), pdata->ftdic);
int num = 0;
do do
{ {
n = ftdi_read_data(pdata->ftdic, cmd, 1); int n = ftdi_read_data(pdata->ftdic, buf, sizeof(buf));
if(n > 0) if(n > 0)
{
avrftdi_print(0, "Low byte lines: 0x%02x\n", cmd[0]);
num += n; num += n;
}
if(!n)
{
retries++;
}
E(n < 0, pdata->ftdic); E(n < 0, pdata->ftdic);
} while(retries < 1/*n < 1*/); } while(num < 1);
avrftdi_print(0, "Read %d extra bytes\n", num-1); if(num > 1)
log_warn("Read %d extra bytes\n", num-1);
#endif #endif
return 0; return 0;
@ -1302,7 +1295,6 @@ avrftdi_setup(PROGRAMMER * pgm)
static void static void
avrftdi_teardown(PROGRAMMER * pgm) avrftdi_teardown(PROGRAMMER * pgm)
{ {
fprintf(stderr, "\n%s: Unintializing programmer.\n", progname);
avrftdi_t* pdata = to_pdata(pgm); avrftdi_t* pdata = to_pdata(pgm);
if(pdata) { if(pdata) {