X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Ftondaj-sl-814%2Fprotocol.c;h=063544e854433bd743f98d2833998e2683930e2e;hb=d9251a2c9f1ca4380c27240ccca90c9f9ed46d3f;hp=a3696b69e79eb1b5e394f6e4dc35d708b8e693b4;hpb=6ec6c43b4738dbc7091f4a49a4ec80ea6102cb52;p=libsigrok.git

diff --git a/src/hardware/tondaj-sl-814/protocol.c b/src/hardware/tondaj-sl-814/protocol.c
index a3696b69..063544e8 100644
--- a/src/hardware/tondaj-sl-814/protocol.c
+++ b/src/hardware/tondaj-sl-814/protocol.c
@@ -69,18 +69,18 @@ static void parse_packet(const uint8_t *buf, float *floatval,
 	/* The value on the display always has one digit after the comma. */
 	*floatval /= 10;
 
-	analog->mq = SR_MQ_SOUND_PRESSURE_LEVEL;
-	analog->unit = SR_UNIT_DECIBEL_SPL;
+	analog->meaning->mq = SR_MQ_SOUND_PRESSURE_LEVEL;
+	analog->meaning->unit = SR_UNIT_DECIBEL_SPL;
 
 	if (is_a)
-		analog->mqflags |= SR_MQFLAG_SPL_FREQ_WEIGHT_A;
+		analog->meaning->mqflags |= SR_MQFLAG_SPL_FREQ_WEIGHT_A;
 	else
-		analog->mqflags |= SR_MQFLAG_SPL_FREQ_WEIGHT_C;
+		analog->meaning->mqflags |= SR_MQFLAG_SPL_FREQ_WEIGHT_C;
 
 	if (is_fast)
-		analog->mqflags |= SR_MQFLAG_SPL_TIME_WEIGHT_F;
+		analog->meaning->mqflags |= SR_MQFLAG_SPL_TIME_WEIGHT_F;
 	else
-		analog->mqflags |= SR_MQFLAG_SPL_TIME_WEIGHT_S;
+		analog->meaning->mqflags |= SR_MQFLAG_SPL_TIME_WEIGHT_S;
 
 	/* TODO: How to handle level? */
 	(void)level;
@@ -90,23 +90,27 @@ static void decode_packet(struct sr_dev_inst *sdi)
 {
 	struct sr_datafeed_packet packet;
 	struct sr_datafeed_analog analog;
+	struct sr_analog_encoding encoding;
+	struct sr_analog_meaning meaning;
+	struct sr_analog_spec spec;
 	struct dev_context *devc;
 	float floatval;
 
 	devc = sdi->priv;
-	memset(&analog, 0, sizeof(struct sr_datafeed_analog));
+
+	sr_analog_init(&analog, &encoding, &meaning, &spec, 1);
 
 	parse_packet(devc->buf, &floatval, &analog);
 
 	/* Send a sample packet with one analog value. */
-	analog.channels = sdi->channels;
+	analog.meaning->channels = sdi->channels;
 	analog.num_samples = 1;
 	analog.data = &floatval;
 	packet.type = SR_DF_ANALOG;
 	packet.payload = &analog;
-	sr_session_send(devc->cb_data, &packet);
+	sr_session_send(sdi, &packet);
 
-	devc->num_samples++;
+	sr_sw_limits_update_samples_read(&devc->limits, 1);
 }
 
 SR_PRIV int tondaj_sl_814_receive_data(int fd, int revents, void *cb_data)
@@ -134,7 +138,8 @@ SR_PRIV int tondaj_sl_814_receive_data(int fd, int revents, void *cb_data)
 		buf[2] = 0x0d;
 		sr_spew("Sending init command: %02x %02x %02x.",
 			buf[0], buf[1], buf[2]);
-		if ((ret = serial_write_blocking(serial, buf, 3, 0)) < 0) {
+		if ((ret = serial_write_blocking(serial, buf, 3,
+				serial_timeout(serial, 3))) < 0) {
 			sr_err("Error sending init command: %d.", ret);
 			return FALSE;
 		}
@@ -160,7 +165,8 @@ SR_PRIV int tondaj_sl_814_receive_data(int fd, int revents, void *cb_data)
 		buf[2] = 0x0d;
 		sr_spew("Sending data request command: %02x %02x %02x.",
 			buf[0], buf[1], buf[2]);
-		if ((ret = serial_write_blocking(serial, buf, 3, 0)) < 0) {
+		if ((ret = serial_write_blocking(serial, buf, 3,
+				serial_timeout(serial, 3))) < 0) {
 			sr_err("Error sending request command: %d.", ret);
 			return FALSE;
 		}
@@ -169,7 +175,7 @@ SR_PRIV int tondaj_sl_814_receive_data(int fd, int revents, void *cb_data)
 	} else if (devc->state == GET_PACKET) {
 		/* Read a packet from the device. */
 		ret = serial_read_nonblocking(serial, devc->buf + devc->buflen,
-				  4 - devc->buflen);
+				4 - devc->buflen);
 		if (ret < 0) {
 			sr_err("Error reading packet: %d.", ret);
 			return TRUE;
@@ -199,11 +205,8 @@ SR_PRIV int tondaj_sl_814_receive_data(int fd, int revents, void *cb_data)
 		return FALSE;
 	}
 
-	/* Stop acquisition if we acquired enough samples. */
-	if (devc->limit_samples && devc->num_samples >= devc->limit_samples) {
-		sr_info("Requested number of samples reached.");
-		sdi->driver->dev_acquisition_stop(sdi, cb_data);
-	}
+	if (sr_sw_limits_check(&devc->limits))
+		sdi->driver->dev_acquisition_stop(sdi);
 
 	return TRUE;
 }