X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fnorma-dmm%2Fapi.c;h=91fc5a1bd7fe3a47c1b9c4fee5fb735ac8983fb9;hb=ffa5f177f15dd8c75612d65b20459e7cdccc68b9;hp=3e6eab7805c100c807b4302add1a41f438341105;hpb=208c1d35435626a11afa1ab301b2071b2a4e187b;p=libsigrok.git

diff --git a/src/hardware/norma-dmm/api.c b/src/hardware/norma-dmm/api.c
index 3e6eab78..91fc5a1b 100644
--- a/src/hardware/norma-dmm/api.c
+++ b/src/hardware/norma-dmm/api.c
@@ -139,9 +139,9 @@ static GSList *scan(struct sr_dev_driver *drv, GSList *options)
 			sdi->model = g_strdup(get_typestr(auxtype, drv));
 			sdi->version = g_strdup(buf + 9);
 			devc = g_malloc0(sizeof(struct dev_context));
+			sr_sw_limits_init(&devc->limits);
 			devc->type = auxtype;
 			devc->version = g_strdup(&buf[9]);
-			devc->elapsed_msec = g_timer_new();
 			sdi->conn = serial;
 			sdi->priv = devc;
 			sdi->driver = drv;
@@ -172,11 +172,6 @@ static GSList *scan(struct sr_dev_driver *drv, GSList *options)
 	return devices;
 }
 
-static GSList *dev_list(const struct sr_dev_driver *di)
-{
-	return ((struct drv_context *)(di->context))->instances;
-}
-
 static int dev_close(struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
@@ -187,17 +182,11 @@ static int dev_close(struct sr_dev_inst *sdi)
 	if ((devc = sdi->priv) && devc->version) {
 		g_free(devc->version);
 		devc->version = NULL;
-		g_timer_destroy(devc->elapsed_msec);
 	}
 
 	return SR_OK;
 }
 
-static int cleanup(const struct sr_dev_driver *di)
-{
-	return std_dev_clear(di, NULL);
-}
-
 static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
 		const struct sr_channel_group *cg)
 {
@@ -213,18 +202,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_MSEC:
-		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,
@@ -249,7 +227,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 	return SR_OK;
 }
 
-static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
 	struct sr_serial_dev_inst *serial;
@@ -258,13 +236,9 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 		return SR_ERR_DEV_CLOSED;
 
 	devc = sdi->priv;
-	devc->cb_data = cb_data;
 
-	std_session_send_df_header(cb_data, LOG_PREFIX);
-
-	/* Start timer, if required. */
-	if (devc->limit_msec)
-		g_timer_start(devc->elapsed_msec);
+	sr_sw_limits_acquisition_start(&devc->limits);
+	std_session_send_df_header(sdi, LOG_PREFIX);
 
 	/* Poll every 100ms, or whenever some data comes in. */
 	serial = sdi->conn;
@@ -274,15 +248,9 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 	return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-	struct dev_context *devc;
-
-	/* Stop timer, if required. */
-	if (sdi && (devc = sdi->priv) && devc->limit_msec)
-		g_timer_stop(devc->elapsed_msec);
-
-	return std_serial_dev_acquisition_stop(sdi, cb_data, dev_close,
+	return std_serial_dev_acquisition_stop(sdi, dev_close,
 			sdi->conn, LOG_PREFIX);
 }
 
@@ -291,9 +259,9 @@ SR_PRIV struct sr_dev_driver norma_dmm_driver_info = {
 	.longname = "Norma DM9x0 DMMs",
 	.api_version = 1,
 	.init = init,
-	.cleanup = cleanup,
+	.cleanup = std_cleanup,
 	.scan = scan,
-	.dev_list = dev_list,
+	.dev_list = std_dev_list,
 	.dev_clear = NULL,
 	.config_get = NULL,
 	.config_set = config_set,
@@ -310,9 +278,9 @@ SR_PRIV struct sr_dev_driver siemens_b102x_driver_info = {
 	.longname = "Siemens B102x DMMs",
 	.api_version = 1,
 	.init = init,
-	.cleanup = cleanup,
+	.cleanup = std_cleanup,
 	.scan = scan,
-	.dev_list = dev_list,
+	.dev_list = std_dev_list,
 	.dev_clear = NULL,
 	.config_get = NULL,
 	.config_set = config_set,