X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fmic-985xx%2Fprotocol.c;h=4ee11b70c8e3ce2e626570487e82db5298db0d9f;hb=e2626373b73e7583a8a02454a6e0771a4f18be44;hp=eb9b48be8d6d24a324deb0776b81514c3ff265be;hpb=676877f6cee574f2a32805b946e56710db502264;p=libsigrok.git

diff --git a/src/hardware/mic-985xx/protocol.c b/src/hardware/mic-985xx/protocol.c
index eb9b48be..4ee11b70 100644
--- 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;
 	}
@@ -93,7 +95,7 @@ static int handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi, int idx)
 {
 	float temperature, humidity;
 	struct sr_datafeed_packet packet;
-	struct sr_datafeed_analog2 analog;
+	struct sr_datafeed_analog analog;
 	struct sr_analog_encoding encoding;
 	struct sr_analog_meaning meaning;
 	struct sr_analog_spec spec;
@@ -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.type = SR_DF_ANALOG;
 	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);