From: Lars-Peter Clausen <redacted>
Date: Sun, 1 May 2016 11:54:26 +0000 (+0200)
Subject: teleinfo: Use software limit helpers
X-Git-Tag: libsigrok-0.5.0~444
X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=ffa5f177f15dd8c75612d65b20459e7cdccc68b9

teleinfo: Use software limit helpers

Signed-off-by: Lars-Peter Clausen <redacted>
---

diff --git a/src/hardware/teleinfo/api.c b/src/hardware/teleinfo/api.c
index 302373d6..be4261c9 100644
--- a/src/hardware/teleinfo/api.c
+++ b/src/hardware/teleinfo/api.c
@@ -148,18 +148,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 		return SR_ERR_BUG;
 	}
 
-	switch (key) {
-	case SR_CONF_LIMIT_SAMPLES:
-		devc->limit_samples = g_variant_get_uint64(data);
-		break;
-	case SR_CONF_LIMIT_MSEC:
-		devc->limit_msec = g_variant_get_uint64(data);
-		break;
-	default:
-		return SR_ERR_NA;
-	}
-
-	return SR_OK;
+	return sr_sw_limits_config_set(&devc->sw_limits, key, data);
 }
 
 static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
@@ -194,13 +183,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 
 	devc = sdi->priv;
 
-	/*
-	 * Reset the number of samples to take. If we've already collected our
-	 * quota, but we start a new session, and don't reset this, we'll just
-	 * quit without acquiring any new samples.
-	 */
-	devc->num_samples = 0;
-	devc->start_time = g_get_monotonic_time();
+	sr_sw_limits_acquisition_start(&devc->sw_limits);
 
 	std_session_send_df_header(sdi, LOG_PREFIX);
 
diff --git a/src/hardware/teleinfo/protocol.c b/src/hardware/teleinfo/protocol.c
index fbbc044d..9cb9ca82 100644
--- a/src/hardware/teleinfo/protocol.c
+++ b/src/hardware/teleinfo/protocol.c
@@ -93,7 +93,7 @@ static void teleinfo_handle_measurement(struct sr_dev_inst *sdi,
 	}
 
 	if (!strcmp(label, "ADCO")) {
-		devc->num_samples++;
+		sr_sw_limits_update_samples_read(&devc->sw_limits, 1);
 	} else if (!strcmp(label, "BASE")) {
 		teleinfo_send_value(sdi, "BASE", v, SR_MQ_POWER, SR_UNIT_WATT_HOUR);
 	} else if (!strcmp(label, "HCHP")) {
@@ -184,7 +184,6 @@ SR_PRIV int teleinfo_receive_data(int fd, int revents, void *cb_data)
 	struct sr_serial_dev_inst *serial;
 	const uint8_t *ptr, *next_ptr, *end_ptr;
 	int len;
-	int64_t time;
 
 	(void)fd;
 
@@ -217,19 +216,8 @@ SR_PRIV int teleinfo_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.");
+	if (sr_sw_limits_check(&devc->sw_limits))
 		sdi->driver->dev_acquisition_stop(sdi);
-		return TRUE;
-	}
 
-	if (devc->limit_msec) {
-		time = (g_get_monotonic_time() - devc->start_time) / 1000;
-		if (time > (int64_t)devc->limit_msec) {
-			sr_info("Requested time limit reached.");
-			sdi->driver->dev_acquisition_stop(sdi);
-			return TRUE;
-		}
-	}
 	return TRUE;
 }
diff --git a/src/hardware/teleinfo/protocol.h b/src/hardware/teleinfo/protocol.h
index b4aa0fef..3f896523 100644
--- a/src/hardware/teleinfo/protocol.h
+++ b/src/hardware/teleinfo/protocol.h
@@ -40,13 +40,10 @@ enum optarif {
 /** Private, per-device-instance driver context. */
 struct dev_context {
 	/* Acquisition settings */
-	uint64_t limit_samples;   /**< The sampling limit (in number of samples). */
-	uint64_t limit_msec;      /**< The time limit (in milliseconds). */
+	struct sr_sw_limits sw_limits;
 
 	/* Operational state */
 	enum optarif optarif;     /**< The device mode (which measures are reported) */
-	uint64_t num_samples;     /**< The number of already received samples. */
-	int64_t start_time;       /**< The time at which sampling started. */
 
 	/* Temporary state across callbacks */
 	uint8_t buf[TELEINFO_BUF_SIZE];