X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fnorma-dmm%2Fprotocol.c;h=7e0f2a10834f7fe0fbacc1e0a3026537ede21311;hb=b02bb45f4cf6378520e5a5b82ff39013cfa270b6;hp=a077cf983b05ef392a642f322ebe9991fab0852e;hpb=5faebab2903dc91949edc31f0a4b118d86090a30;p=libsigrok.git

diff --git a/src/hardware/norma-dmm/protocol.c b/src/hardware/norma-dmm/protocol.c
index a077cf98..7e0f2a10 100644
--- a/src/hardware/norma-dmm/protocol.c
+++ b/src/hardware/norma-dmm/protocol.c
@@ -30,7 +30,7 @@
 SR_PRIV const struct nmadmm_req nmadmm_requests[] = {
 	{ NMADMM_REQ_IDN, "IDN?" },
 	{ NMADMM_REQ_IDN, "STATUS?" },
-	{ 0, NULL },
+	ALL_ZERO
 };
 
 static int nma_send_req(const struct sr_dev_inst *sdi, int req, char *params)
@@ -366,10 +366,10 @@ static void nma_process_line(const struct sr_dev_inst *sdi)
 	memset(&packet, 0, sizeof(struct sr_datafeed_packet));
 	packet.type = SR_DF_ANALOG_OLD;
 	packet.payload = &analog;
-	sr_session_send(devc->cb_data, &packet);
+	sr_session_send(sdi, &packet);
 
 	/* Finish processing. */
-	devc->num_samples++;
+	sr_sw_limits_update_samples_read(&devc->limits, 1);
 	devc->buflen = 0;
 }
 
@@ -379,8 +379,6 @@ SR_PRIV int norma_dmm_receive_data(int fd, int revents, void *cb_data)
 	struct dev_context *devc;
 	struct sr_serial_dev_inst *serial;
 	int len;
-	gboolean terminating;
-	gdouble elapsed_s;
 
 	(void)fd;
 
@@ -411,23 +409,10 @@ SR_PRIV int norma_dmm_receive_data(int fd, int revents, void *cb_data)
 		}
 	}
 
-	/* If number of samples or time limit reached, stop acquisition. */
-	terminating = FALSE;
-	if (devc->limit_samples && (devc->num_samples >= devc->limit_samples)) {
-		sdi->driver->dev_acquisition_stop(sdi, cb_data);
-		terminating = TRUE;
-	}
-
-	if (devc->limit_msec) {
-		elapsed_s = g_timer_elapsed(devc->elapsed_msec, NULL);
-		if ((elapsed_s * 1000) >= devc->limit_msec) {
-			sdi->driver->dev_acquisition_stop(sdi, cb_data);
-			terminating = TRUE;
-		}
-	}
-
-	/* Request next package. */
-	if (!terminating) {
+	if (sr_sw_limits_check(&devc->limits)) {
+		sdi->driver->dev_acquisition_stop(sdi);
+	} else {
+		/* Request next package. */
 		if (devc->last_req_pending) {
 			gint64 elapsed_us = g_get_monotonic_time() - devc->req_sent_at;
 			if (elapsed_us > NMADMM_TIMEOUT_MS * 1000) {/* Timeout! */