X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fserial-dmm%2Fprotocol.c;h=3ea85be5461bc014938c4c37955fd72990ea3792;hb=9f51c463d1bfd182ddf8ae1c5bc83377ef93d2bc;hp=edf8382b35d64c778f7e4b8207aec112c3562e67;hpb=6ec6c43b4738dbc7091f4a49a4ec80ea6102cb52;p=libsigrok.git

diff --git a/src/hardware/serial-dmm/protocol.c b/src/hardware/serial-dmm/protocol.c
index edf8382b..3ea85be5 100644
--- a/src/hardware/serial-dmm/protocol.c
+++ b/src/hardware/serial-dmm/protocol.c
@@ -44,7 +44,7 @@ static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi,
 	struct dmm_info *dmm;
 	float floatval;
 	struct sr_datafeed_packet packet;
-	struct sr_datafeed_analog analog;
+	struct sr_datafeed_analog_old analog;
 	struct dev_context *devc;
 
 	dmm = (struct dmm_info *)sdi->driver;
@@ -52,7 +52,7 @@ static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi,
 	log_dmm_packet(buf);
 	devc = sdi->priv;
 
-	memset(&analog, 0, sizeof(struct sr_datafeed_analog));
+	memset(&analog, 0, sizeof(struct sr_datafeed_analog_old));
 
 	analog.channels = sdi->channels;
 	analog.num_samples = 1;
@@ -67,10 +67,10 @@ static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi,
 
 	if (analog.mq != -1) {
 		/* Got a measurement. */
-		packet.type = SR_DF_ANALOG;
+		packet.type = SR_DF_ANALOG_OLD;
 		packet.payload = &analog;
-		sr_session_send(devc->cb_data, &packet);
-		devc->num_samples++;
+		sr_session_send(sdi, &packet);
+		sr_sw_limits_update_samples_read(&devc->limits, 1);
 	}
 }
 
@@ -160,7 +160,6 @@ int receive_data(int fd, int revents, void *cb_data)
 	struct sr_dev_inst *sdi;
 	struct dev_context *devc;
 	struct dmm_info *dmm;
-	int64_t time;
 	void *info;
 
 	(void)fd;
@@ -184,20 +183,8 @@ int receive_data(int fd, int revents, void *cb_data)
 			return FALSE;
 	}
 
-	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);
-		return TRUE;
-	}
-
-	if (devc->limit_msec) {
-		time = (g_get_monotonic_time() - devc->starttime) / 1000;
-		if (time > (int64_t)devc->limit_msec) {
-			sr_info("Requested time limit reached.");
-			sdi->driver->dev_acquisition_stop(sdi, cb_data);
-			return TRUE;
-		}
-	}
+	if (sr_sw_limits_check(&devc->limits))
+		sdi->driver->dev_acquisition_stop(sdi);
 
 	return TRUE;
 }