]> sigrok.org Git - libsigrok.git/commitdiff
tondaj-sl-814: Fix blocking serial write timeout.
authorUwe Hermann <redacted>
Sun, 13 Sep 2015 20:44:40 +0000 (22:44 +0200)
committerUwe Hermann <redacted>
Sun, 13 Sep 2015 21:21:04 +0000 (23:21 +0200)
This fixes bug #436.

src/hardware/tondaj-sl-814/protocol.c

index a3696b69e79eb1b5e394f6e4dc35d708b8e693b4..44d12ec4f40866f61e477493d6c8974cac93ea26 100644 (file)
@@ -134,7 +134,8 @@ SR_PRIV int tondaj_sl_814_receive_data(int fd, int revents, void *cb_data)
                buf[2] = 0x0d;
                sr_spew("Sending init command: %02x %02x %02x.",
                        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);
                        return FALSE;
                }
@@ -160,7 +161,8 @@ SR_PRIV int tondaj_sl_814_receive_data(int fd, int revents, void *cb_data)
                buf[2] = 0x0d;
                sr_spew("Sending data request command: %02x %02x %02x.",
                        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);
                        return FALSE;
                }