X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fbaylibre-acme%2Fprotocol.c;h=ea25d95b00fcb3add71053454df369fd33363c32;hb=d54a7c42ac6540d90e99e5138c945d789e3dac6f;hp=c09e91aad58699116e381c4e45c74f11d3d8947b;hpb=695dc859c15ba4190f5c1aa2e1a6e2dc6a6e5845;p=libsigrok.git

diff --git a/src/hardware/baylibre-acme/protocol.c b/src/hardware/baylibre-acme/protocol.c
index c09e91aa..ea25d95b 100644
--- a/src/hardware/baylibre-acme/protocol.c
+++ b/src/hardware/baylibre-acme/protocol.c
@@ -167,6 +167,7 @@ SR_PRIV gboolean bl_acme_detect_probe(unsigned int addr,
 		sr_dbg("Name for probe %d can't be read: %s",
 		       prb_num, err->message);
 		g_string_free(path, TRUE);
+		g_error_free(err);
 		return ret;
 	}
 
@@ -201,6 +202,7 @@ static int get_hwmon_index(unsigned int addr)
 	if (!dir) {
 		sr_err("Error opening %s: %s", path->str, err->message);
 		g_string_free(path, TRUE);
+		g_error_free(err);
 		return -1;
 	}
 
@@ -484,6 +486,7 @@ SR_PRIV int bl_acme_get_shunt(const struct sr_channel_group *cg,
 	if (!status) {
 		sr_err("Error reading shunt resistance: %s", err->message);
 		ret = SR_ERR_IO;
+		g_error_free(err);
 		goto out;
 	}
 
@@ -694,7 +697,6 @@ SR_PRIV void bl_acme_close_channel(struct sr_channel *ch)
 
 SR_PRIV int bl_acme_receive_data(int fd, int revents, void *cb_data)
 {
-	uint32_t cur_time, elapsed_time;
 	uint64_t nrexpiration;
 	struct sr_datafeed_packet packet, framep;
 	struct sr_datafeed_analog_old analog;
@@ -780,23 +782,11 @@ SR_PRIV int bl_acme_receive_data(int fd, int revents, void *cb_data)
 		sr_session_send(sdi, &framep);
 	}
 
-	devc->samples_read++;
-	if (devc->limit_samples > 0 &&
-	    devc->samples_read >= devc->limit_samples) {
-		sr_info("Requested number of samples reached.");
+	sr_sw_limits_update_samples_read(&devc->limits, 1);
+
+	if (sr_sw_limits_check(&devc->limits)) {
 		sdi->driver->dev_acquisition_stop(sdi);
-		devc->last_sample_fin = g_get_monotonic_time();
 		return TRUE;
-	} else if (devc->limit_msec > 0) {
-		cur_time = g_get_monotonic_time();
-		elapsed_time = cur_time - devc->start_time;
-
-		if (elapsed_time >= devc->limit_msec) {
-			sr_info("Sampling time limit reached.");
-			sdi->driver->dev_acquisition_stop(sdi);
-			devc->last_sample_fin = g_get_monotonic_time();
-			return TRUE;
-		}
 	}
 
 	devc->last_sample_fin = g_get_monotonic_time();