mic-985xx: Fix blocking serial write timeout.

[libsigrok.git] / src / hardware / mic-985xx / protocol.c

diff --git a/src/hardware/mic-985xx/protocol.c b/src/hardware/mic-985xx/protocol.c
index eb9b48be8d6d24a324deb0776b81514c3ff265be..d7c69d0e315c9e49ae6e85fcc736e34886941a26 100644 (file)
--- a/src/hardware/mic-985xx/protocol.c
+++ b/src/hardware/mic-985xx/protocol.c
@@ -18,13 +18,15 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#include <config.h>
 #include "protocol.h"
 
 static int mic_send(struct sr_serial_dev_inst *serial, const char *cmd)
 {
        int ret;
 
-       if ((ret = serial_write_blocking(serial, cmd, strlen(cmd), 0)) < 0) {
+       if ((ret = serial_write_blocking(serial, cmd, strlen(cmd),
+                       serial_timeout(serial, strlen(cmd)))) < 0) {
                sr_err("Error sending '%s' command: %d.", cmd, ret);
                return SR_ERR;
        }
@@ -111,32 +113,12 @@ static int handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi, int idx)
                return SR_ERR;
        }
 
-       memset(&analog, 0, sizeof(struct sr_datafeed_analog));
-       memset(&encoding, 0, sizeof(struct sr_analog_encoding));
-       memset(&meaning, 0, sizeof(struct sr_analog_meaning));
-       memset(&spec, 0, sizeof(struct sr_analog_spec));
+       sr_analog_init(&analog, &encoding, &meaning, &spec, 3);
 
        /* Common values for both channels. */
        packet.type = SR_DF_ANALOG2;
        packet.payload = &analog;
-       analog.encoding = &encoding;
-       analog.meaning = &meaning;
-       analog.spec = &spec;
        analog.num_samples = 1;
-       encoding.unitsize = sizeof(float);
-       encoding.is_float = TRUE;
-#ifdef WORDS_BIGENDIAN
-       encoding.is_bigendian = TRUE;
-#else
-       encoding.is_bigendian = FALSE;
-#endif
-       encoding.digits = 3; /* Values are always 3-digit numbers. */
-       encoding.is_digits_decimal = TRUE;
-       encoding.scale.p = 1;
-       encoding.scale.q = 1;
-       encoding.offset.p = 0;
-       encoding.offset.q = 1;
-       spec.spec_digits = encoding.digits;
 
        /* Temperature. */
        l = g_slist_copy(sdi->channels);