X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fmic-985xx%2Fprotocol.c;h=15368065a6d3145c29754da7bbc0f0d74d83e442;hb=53b4680fceab9351fc87b8c5b34854733f5fdac0;hp=828a91cc24084a7f02e17b63a0564cfcc2cd747e;hpb=6f3e5335adc5ba4488c5f7dcb791f929c20f2049;p=libsigrok.git

diff --git a/hardware/mic-985xx/protocol.c b/hardware/mic-985xx/protocol.c
index 828a91cc..15368065 100644
--- a/hardware/mic-985xx/protocol.c
+++ b/hardware/mic-985xx/protocol.c
@@ -108,6 +108,9 @@ static int handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi, int idx)
 		return SR_ERR;
 	}
 
+	/* Clear 'analog', otherwise it'll contain random garbage. */
+	memset(&analog, 0, sizeof(struct sr_datafeed_analog));
+
 	/* Common values for both probes. */
 	packet.type = SR_DF_ANALOG;
 	packet.payload = &analog;
@@ -143,13 +146,15 @@ static int handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi, int idx)
 static void handle_new_data(struct sr_dev_inst *sdi, int idx)
 {
 	struct dev_context *devc;
+	struct sr_serial_dev_inst *serial;
 	int len, i, offset = 0;
 
 	devc = sdi->priv;
+	serial = sdi->conn;
 
 	/* Try to get as much data as the buffer can hold. */
 	len = SERIAL_BUFSIZE - devc->buflen;
-	len = serial_read(devc->serial, devc->buf + devc->buflen, len);
+	len = serial_read(serial, devc->buf + devc->buflen, len);
 	if (len < 1) {
 		sr_err("Serial port read error: %d.", len);
 		return;
@@ -179,6 +184,7 @@ static int receive_data(int fd, int revents, int idx, void *cb_data)
 	struct dev_context *devc;
 	int64_t t;
 	static gboolean first_time = TRUE;
+	struct sr_serial_dev_inst *serial;
 
 	(void)fd;
 
@@ -188,13 +194,15 @@ static int receive_data(int fd, int revents, int idx, void *cb_data)
 	if (!(devc = sdi->priv))
 		return TRUE;
 
+	serial = sdi->conn;
+
 	if (revents == G_IO_IN) {
 		/* New data arrived. */
 		handle_new_data(sdi, idx);
 	} else {
 		/* Timeout. */
 		if (first_time) {
-			mic_cmd_set_realtime_mode(devc->serial);
+			mic_cmd_set_realtime_mode(serial);
 			first_time = FALSE;
 		}
 	}