X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Ffluke-dmm%2Fapi.c;h=0ee6c7fa64dea886e134bdca996395cfb888fb32;hb=8f68f36bc527f47f09445bbad1779a9fa3a22159;hp=eba36c549824b5c8b8cc2e7cd6a8d4d275246953;hpb=cd0de200b17820975637ddafba8a68902648344e;p=libsigrok.git

diff --git a/src/hardware/fluke-dmm/api.c b/src/hardware/fluke-dmm/api.c
index eba36c54..0ee6c7fa 100644
--- a/src/hardware/fluke-dmm/api.c
+++ b/src/hardware/fluke-dmm/api.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
-#include "fluke-dmm.h"
+#include "protocol.h"
 
 static const uint32_t scanopts[] = {
 	SR_CONF_CONN,
@@ -118,6 +118,7 @@ static GSList *fluke_scan(struct sr_dev_driver *di, const char *conn,
 				sdi->model = g_strdup(tokens[0] + 6);
 				sdi->version = g_strdup(tokens[1] + s);
 				devc = g_malloc0(sizeof(struct dev_context));
+				sr_sw_limits_init(&devc->limits);
 				devc->profile = &supported_flukedmm[i];
 				sdi->inst_type = SR_INST_SERIAL;
 				sdi->conn = serial;
@@ -190,19 +191,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 
 	devc = sdi->priv;
 
-	switch (key) {
-	case SR_CONF_LIMIT_MSEC:
-		/* TODO: not yet implemented */
-		devc->limit_msec = g_variant_get_uint64(data);
-		break;
-	case SR_CONF_LIMIT_SAMPLES:
-		devc->limit_samples = g_variant_get_uint64(data);
-		break;
-	default:
-		return SR_ERR_NA;
-	}
-
-	return SR_OK;
+	return sr_sw_limits_config_set(&devc->limits, key, data);
 }
 
 static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
@@ -237,7 +226,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 
 	devc = sdi->priv;
 
-	std_session_send_df_header(sdi, LOG_PREFIX);
+	sr_sw_limits_acquisition_start(&devc->limits);
+	std_session_send_df_header(sdi);
 
 	/* Poll every 100ms, or whenever some data comes in. */
 	serial = sdi->conn;
@@ -254,12 +244,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi)
-{
-	return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close,
-			sdi->conn, LOG_PREFIX);
-}
-
 static struct sr_dev_driver flukedmm_driver_info = {
 	.name = "fluke-dmm",
 	.longname = "Fluke 18x/28x series DMMs",
@@ -275,7 +259,7 @@ static struct sr_dev_driver flukedmm_driver_info = {
 	.dev_open = std_serial_dev_open,
 	.dev_close = std_serial_dev_close,
 	.dev_acquisition_start = dev_acquisition_start,
-	.dev_acquisition_stop = dev_acquisition_stop,
+	.dev_acquisition_stop = std_serial_dev_acquisition_stop,
 	.context = NULL,
 };
 SR_REGISTER_DEV_DRIVER(flukedmm_driver_info);