mirror/libserialport
mirror/libserialport
1
0
Fork 0
mirror of git://sigrok.org/libserialport synced 2023-08-10 21:13:24 +03:00
Code Issues Projects Releases Wiki Activity

Move special case for poll() timeout to call site.

Browse Source
This commit is contained in:
Martin Ling 2020-01-04 00:13:24 +00:00
parent 3317d678de
commit 9d1ca7c855
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
serialport.c
View File

@ -210,9 +210,7 @@ static struct timeval *timeout_timeval(struct timeout *timeout)
static unsigned int timeout_remaining_ms(struct timeout *timeout) static unsigned int timeout_remaining_ms(struct timeout *timeout)
{ {
if (timeout->ms == 0) if (timeout->limit_ms && timeout->overflow)
return -1;
else if (timeout->limit_ms && timeout->overflow)
return timeout->limit_ms; return timeout->limit_ms;
else else
return time_as_ms(&timeout->delta); return time_as_ms(&timeout->delta);
@ -1625,7 +1623,7 @@ SP_API enum sp_return sp_wait(struct sp_event_set *event_set,
break; break;
} }
result = poll(pollfds, event_set->count, timeout_remaining_ms(&timeout)); result = poll(pollfds, event_set->count, timeout_remaining_ms(&timeout) || -1);
started = 1; started = 1;
if (result < 0) { if (result < 0) {