X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fmotech-lps-30x%2Fapi.c;h=57bc1d2654e9f9a966c85e7c9e7bf078970b41c8;hb=c2fdcc25a47c4c8f25e3ea96ea36a674a151e839;hp=4bda494a70f1ed7b342e46efff565e9fd9c82ee6;hpb=c01bf34ca264b268fee2e71ab918c71d28dc3018;p=libsigrok.git

diff --git a/src/hardware/motech-lps-30x/api.c b/src/hardware/motech-lps-30x/api.c
index 4bda494a..57bc1d26 100644
--- a/src/hardware/motech-lps-30x/api.c
+++ b/src/hardware/motech-lps-30x/api.c
@@ -133,11 +133,6 @@ static const struct lps_modelspec models[] = {
 	},
 };
 
-static int init_lps301(struct sr_dev_driver *di, struct sr_context *sr_ctx)
-{
-	return std_init(sr_ctx, di, LOG_PREFIX);
-}
-
 /** Send command to device with va_list.
  */
 SR_PRIV int lps_send_va(struct sr_serial_dev_inst *serial, const char *fmt, va_list args)
@@ -460,11 +455,8 @@ static GSList *do_scan(lps_modelid modelid, struct sr_dev_driver *drv, GSList *o
 	sdi->conn = serial;
 
 	devc = g_malloc0(sizeof(struct dev_context));
+	sr_sw_limits_init(&devc->limits);
 	devc->model = &models[modelid];
-	devc->limit_samples = 0;
-	devc->limit_msec = 0;
-	devc->num_samples = 0;
-	devc->elapsed_msec = g_timer_new();
 
 	sdi->priv = devc;
 
@@ -524,8 +516,6 @@ static void dev_clear_private(struct dev_context *devc)
 	/* Free channel_status.info (list only, data owned by sdi). */
 	for (ch_idx = 0; ch_idx < devc->model->num_channels; ch_idx++)
 		g_slist_free(devc->channel_status[ch_idx].info);
-
-	g_timer_destroy(devc->elapsed_msec);
 }
 
 static int dev_clear_lps301(const struct sr_dev_driver *di)
@@ -549,11 +539,8 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 		/* No channel group: global options. */
 		switch (key) {
 		case SR_CONF_LIMIT_SAMPLES:
-			*data = g_variant_new_uint64(devc->limit_samples);
-			break;
 		case SR_CONF_LIMIT_MSEC:
-			*data = g_variant_new_uint64(devc->limit_msec);
-			break;
+			return sr_sw_limits_config_get(&devc->limits, key, data);
 		case SR_CONF_CHANNEL_CONFIG:
 			*data = g_variant_new_string(channel_modes[devc->tracking_mode]);
 			break;
@@ -614,11 +601,8 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 		/* No channel group: global options. */
 		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;
+			return sr_sw_limits_config_set(&devc->limits, key, data);
 		case SR_CONF_CHANNEL_CONFIG:
 			sval = g_variant_get_string(data, NULL);
 			found = FALSE;
@@ -803,9 +787,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 			motech_lps_30x_receive_data, (void *)sdi);
 	std_session_send_df_header(sdi, LOG_PREFIX);
 
-	/* Start timer, if required. */
-	if (devc->limit_msec)
-		g_timer_start(devc->elapsed_msec);
+	sr_sw_limits_acquisition_start(&devc->limits);
 
 	devc->acq_req = AQ_NONE;
 	/* Do not start polling device here, the read function will do it in 50 ms. */
@@ -815,12 +797,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 
 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, std_serial_dev_close,
 			sdi->conn, LOG_PREFIX);
 }
@@ -829,7 +805,7 @@ SR_PRIV struct sr_dev_driver motech_lps_301_driver_info = {
 	.name = "motech-lps-301",
 	.longname = "Motech LPS-301",
 	.api_version = 1,
-	.init = init_lps301,
+	.init = std_init,
 	.cleanup = std_cleanup,
 	.scan = scan_lps301,
 	.dev_list = std_dev_list,