From: Bert Vermeulen <redacted>
Date: Wed, 8 Oct 2014 00:23:20 +0000 (+0200)
Subject: colead-slm: Fix serial port timeout.
X-Git-Tag: libsigrok-0.4.0~882
X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=9e6d9bee2a6771aab111ad95140caf520310b109

colead-slm: Fix serial port timeout.
---

diff --git a/src/hardware/colead-slm/protocol.c b/src/hardware/colead-slm/protocol.c
index 64ac12cb..182c77bb 100644
--- a/src/hardware/colead-slm/protocol.c
+++ b/src/hardware/colead-slm/protocol.c
@@ -184,7 +184,7 @@ SR_PRIV int colead_slm_receive_data(int fd, int revents, void *cb_data)
 	const struct sr_dev_inst *sdi;
 	struct dev_context *devc;
 	struct sr_serial_dev_inst *serial;
-	int len;
+	int delay_ms, len;
 	char buf[128];
 
 	(void)fd;
@@ -207,7 +207,8 @@ SR_PRIV int colead_slm_receive_data(int fd, int revents, void *cb_data)
 			 * we don't want it. */
 			return TRUE;
 		/* Got 0x10, "measurement ready". */
-		if (serial_write_blocking(serial, "\x20", 1, 0) < 1)
+		delay_ms = serial_timeout(serial, 1);
+		if (serial_write_blocking(serial, "\x20", 1, delay_ms) < 1)
 			sr_err("unable to send command");
 		else {
 			devc->state = COMMAND_SENT;