avr/avrdude
2
0
Fork 0
mirror of https://github.com/mariusgreuel/avrdude.git synced 2026-08-18 12:40:39 +00:00
Code Issues Projects Releases Wiki Activity

Establish avr_*timestamp() routines for timing

Browse Source
This commit is contained in:
Stefan Rueger
2022-11-25 22:09:02 +00:00
parent 231e88aaf9
commit 1cb169ec93
7 changed files with 54 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/stk500v2.c
View File

@@ -603,7 +603,6 @@ static int stk500v2_recv(const PROGRAMMER *pgm, unsigned char *msg, size_t maxsi
* https://savannah.nongnu.org/bugs/index.php?43626
*/
long timeoutval = SERIAL_TIMEOUT; // seconds
struct timeval tv;
double tstart, tnow;
if (PDATA(pgm)->pgmtype == PGMTYPE_AVRISP_MKII ||
@@ -616,8 +615,7 @@ static int stk500v2_recv(const PROGRAMMER *pgm, unsigned char *msg, size_t maxsi
DEBUG("STK500V2: stk500v2_recv(): ");
gettimeofday(&tv, NULL);
tstart = tv.tv_sec;
tstart = avr_timestamp();
while ( (state != sDONE ) && (!timeout) ) {
if (serial_recv(&pgm->fd, &c, 1) < 0)
@@ -690,9 +688,8 @@ static int stk500v2_recv(const PROGRAMMER *pgm, unsigned char *msg, size_t maxsi
return -5;
} /* switch */
gettimeofday(&tv, NULL);
tnow = tv.tv_sec;
if (tnow-tstart > timeoutval) { // wuff - signed/unsigned/overflow
tnow = avr_timestamp();
if (tnow-tstart > timeoutval) {
timedout:
pmsg_error("timeout\n");
return -1;