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

tondaj-sl-814: Fix blocking serial write timeout. 

This fixes bug #436.
This commit is contained in:
Uwe Hermann 2015-09-13 22:44:40 +02:00
parent 428d79a810
commit 32c45845f7
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/hardware/tondaj-sl-814/protocol.c
View File

@ -134,7 +134,8 @@ SR_PRIV int tondaj_sl_814_receive_data(int fd, int revents, void *cb_data)
buf[2] = 0x0d; buf[2] = 0x0d;
sr_spew("Sending init command: %02x %02x %02x.", sr_spew("Sending init command: %02x %02x %02x.",
buf[0], buf[1], buf[2]); buf[0], buf[1], buf[2]);
if ((ret = serial_write_blocking(serial, buf, 3, 0)) < 0) { if ((ret = serial_write_blocking(serial, buf, 3,
serial_timeout(serial, 3))) < 0) {
sr_err("Error sending init command: %d.", ret); sr_err("Error sending init command: %d.", ret);
return FALSE; return FALSE;
} }
@ -160,7 +161,8 @@ SR_PRIV int tondaj_sl_814_receive_data(int fd, int revents, void *cb_data)
buf[2] = 0x0d; buf[2] = 0x0d;
sr_spew("Sending data request command: %02x %02x %02x.", sr_spew("Sending data request command: %02x %02x %02x.",
buf[0], buf[1], buf[2]); buf[0], buf[1], buf[2]);
if ((ret = serial_write_blocking(serial, buf, 3, 0)) < 0) { if ((ret = serial_write_blocking(serial, buf, 3,
serial_timeout(serial, 3))) < 0) {
sr_err("Error sending request command: %d.", ret); sr_err("Error sending request command: %d.", ret);
return FALSE; return FALSE;
} }