BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fluke-dmm: Mark serial read call as nonblocking. 

This call was already nonblocking since the driver opens the port with the
SERIAL_NONBLOCK flag. Only one byte is read. The case of 0 being returned
is not handled, but the call is only made if G_IO_IN occurred so in theory,
there should be a byte available. It might be wise to add handling for a
return of 0 nonetheless, as I'm not sure if this is always accurate.
This commit is contained in:
Martin Ling 2014-09-21 18:12:48 +01:00 committed by Uwe Hermann
parent 55e32714f9
commit 707fa85ad5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hardware/fluke-dmm/fluke.c
View File

@ -501,7 +501,7 @@ SR_PRIV int fluke_receive_data(int fd, int revents, void *cb_data)
if (revents == G_IO_IN) { if (revents == G_IO_IN) {
/* Serial data arrived. */ /* Serial data arrived. */
while(FLUKEDMM_BUFSIZE - devc->buflen - 1 > 0) { while(FLUKEDMM_BUFSIZE - devc->buflen - 1 > 0) {
len = serial_read(serial, devc->buf + devc->buflen, 1); len = serial_read_nonblocking(serial, devc->buf + devc->buflen, 1);
if (len < 1) if (len < 1)
break; break;
devc->buflen++; devc->buflen++;