From: Martin Ling <redacted>
Date: Sun, 21 Sep 2014 18:24:33 +0000 (+0100)
Subject: tondaj-sl-814: Mark serial read/write calls as blocking.
X-Git-Tag: libsigrok-0.4.0~941
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=539a85596febaca66c038b346e95068913c9cb45;p=libsigrok.git

tondaj-sl-814: Mark serial read/write calls as blocking.

These calls are executed from an event handler and were previously nonblocking,
but they have no partial read/write handling. The code is already marked TODO
for improvement.
---

diff --git a/src/hardware/tondaj-sl-814/protocol.c b/src/hardware/tondaj-sl-814/protocol.c
index b4deee13..d4f89b7f 100644
--- a/src/hardware/tondaj-sl-814/protocol.c
+++ b/src/hardware/tondaj-sl-814/protocol.c
@@ -133,14 +133,14 @@ 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(serial, buf, 3)) < 0) {
+		if ((ret = serial_write_blocking(serial, buf, 3)) < 0) {
 			sr_err("Error sending init command: %d.", ret);
 			return FALSE;
 		}
 		devc->state = GET_INIT_REPLY;
 	} else if (devc->state == GET_INIT_REPLY) {
 		/* If we just sent the "init" command, get its reply. */
-		if ((ret = serial_read(serial, buf, 2)) < 0) {
+		if ((ret = serial_read_blocking(serial, buf, 2)) < 0) {
 			sr_err("Error reading init reply: %d.", ret);
 			return FALSE;
 		}
@@ -159,7 +159,7 @@ 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(serial, buf, 3)) < 0) {
+		if ((ret = serial_write_blocking(serial, buf, 3)) < 0) {
 			sr_err("Error sending request command: %d.", ret);
 			return FALSE;
 		}