X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcolead-slm%2Fprotocol.c;h=e10fc37e438b8dbf7f914faafa579fbd9160f031;hb=refs%2Fheads%2Flibsigrok-0.2.x;hp=85ecc108afd07d7bf4f850f83e1a1124a4b0c9d6;hpb=a8d09e13264be77bcf1fe53202880ce4c26e39f9;p=libsigrok.git

diff --git a/hardware/colead-slm/protocol.c b/hardware/colead-slm/protocol.c
index 85ecc108..e10fc37e 100644
--- a/hardware/colead-slm/protocol.c
+++ b/hardware/colead-slm/protocol.c
@@ -25,7 +25,6 @@
 #include <errno.h>
 #include <string.h>
 
-
 static void process_packet(const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
@@ -75,6 +74,7 @@ static void process_packet(const struct sr_dev_inst *sdi)
 	memset(&analog, 0, sizeof(struct sr_datafeed_analog));
 	analog.mq = SR_MQ_SOUND_PRESSURE_LEVEL;
 	analog.unit = SR_UNIT_DECIBEL_SPL;
+	analog.probes = sdi->probes;
 	analog.num_samples = 1;
 	analog.data = &fvalue;
 
@@ -180,9 +180,12 @@ 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;
 	char buf[128];
 
+	(void)fd;
+
 	if (!(sdi = cb_data))
 		return TRUE;
 
@@ -193,21 +196,23 @@ SR_PRIV int colead_slm_receive_data(int fd, int revents, void *cb_data)
 		/* Timeout event. */
 		return TRUE;
 
+	serial = sdi->conn;
 	if (devc->state == IDLE) {
-		if (serial_read(fd, buf, 128) != 1 || buf[0] != 0x10)
+		if (serial_read(serial, buf, 128) != 1 || buf[0] != 0x10)
 			/* Nothing there, or caught the tail end of a previous packet,
 			 * or some garbage. Unless it's a single "data ready" byte,
 			 * we don't want it. */
 			return TRUE;
 		/* Got 0x10, "measurement ready". */
-		if (serial_write(fd, "\x20", 1) == -1)
+		if (serial_write(serial, "\x20", 1) == -1)
 			sr_err("unable to send command: %s", strerror(errno));
 		else {
 			devc->state = COMMAND_SENT;
 			devc->buflen = 0;
 		}
 	} else {
-		len = serial_read(fd, devc->buf + devc->buflen, 10 - devc->buflen);
+		len = serial_read(serial, devc->buf + devc->buflen,
+				10 - devc->buflen);
 		if (len < 1)
 			return TRUE;
 		devc->buflen += len;
@@ -226,4 +231,3 @@ SR_PRIV int colead_slm_receive_data(int fd, int revents, void *cb_data)
 
 	return TRUE;
 }
-