From: Martin Ling <redacted>
Date: Sun, 21 Sep 2014 17:07:14 +0000 (+0100)
Subject: conrad-digi-35-cpu: Make serial write call block.
X-Git-Tag: libsigrok-0.4.0~963
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=55e32714f994aaf4841b59bc67c82d263aeb0a70;p=libsigrok.git

conrad-digi-35-cpu: Make serial write call block.

This call was previously nonblocking, but there is no partial write handling.
It is only called from config_set so it is free to block.
---

diff --git a/src/hardware/conrad-digi-35-cpu/protocol.c b/src/hardware/conrad-digi-35-cpu/protocol.c
index 7657b319..cfabdc7b 100644
--- a/src/hardware/conrad-digi-35-cpu/protocol.c
+++ b/src/hardware/conrad-digi-35-cpu/protocol.c
@@ -48,7 +48,7 @@ SR_PRIV int send_msg1(const struct sr_dev_inst *sdi, char cmd, int param)
 
 	sr_spew("send_msg1(): %c%c%c%c\\r", buf[0], buf[1], buf[2], buf[3]);
 
-	if (serial_write(serial, buf, sizeof(buf)) == -1) {
+	if (serial_write_blocking(serial, buf, sizeof(buf)) == -1) {
 		sr_err("Write error for cmd=%c: %d %s", cmd, errno, strerror(errno));
 		return SR_ERR;
 	}