X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Farachnid-labs-re-load-pro%2Fapi.c;h=49d39086aed09e070c28451e322fd98cd6edf730;hb=15f96409dc54fd2ef784c59156daedd9acfa78ed;hp=aeacda1046d5a1cd39a5f2ec8f703e7cee8efd35;hpb=dd5c48a6d567a3cac62c4b0058588273bbeea171;p=libsigrok.git

diff --git a/src/hardware/arachnid-labs-re-load-pro/api.c b/src/hardware/arachnid-labs-re-load-pro/api.c
index aeacda10..49d39086 100644
--- a/src/hardware/arachnid-labs-re-load-pro/api.c
+++ b/src/hardware/arachnid-labs-re-load-pro/api.c
@@ -59,23 +59,18 @@ static const uint32_t devopts_cg[] = {
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
 	struct sr_dev_inst *sdi;
-	struct drv_context *drvc;
 	struct dev_context *devc;
 	struct sr_config *src;
 	struct sr_serial_dev_inst *serial;
 	struct sr_channel_group *cg;
 	struct sr_channel *ch;
-	GSList *l, *devices;
+	GSList *l;
 	int ret, len;
 	const char *conn, *serialcomm;
 	char buf[100];
 	char *bufptr;
 	double version;
 
-	devices = NULL;
-	drvc = di->context;
-	drvc->instances = NULL;
-
 	conn = serialcomm = NULL;
 	for (l = options; l; l = l->next) {
 		src = l->data;
@@ -131,7 +126,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	sdi->vendor = g_strdup("Arachnid Labs");
 	sdi->model = g_strdup("Re:load Pro");
 	sdi->version = g_strdup(buf + 8);
-	sdi->driver = di;
 	sdi->inst_type = SR_INST_SERIAL;
 	sdi->conn = serial;
 
@@ -146,15 +140,12 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	cg->channels = g_slist_append(cg->channels, ch);
 
 	devc = g_malloc0(sizeof(struct dev_context));
+	sr_sw_limits_init(&devc->limits);
 	sdi->priv = devc;
-	drvc->instances = g_slist_append(drvc->instances, sdi);
-	devices = g_slist_append(devices, sdi);
 
 	serial_close(serial);
-	if (!devices)
-		sr_serial_dev_inst_free(serial);
 
-	return devices;
+	return std_scan_complete(di, g_slist_append(NULL, sdi));
 }
 
 static int config_list(uint32_t key, GVariant **data,
@@ -236,11 +227,8 @@ static int config_get(uint32_t key, GVariant **data,
 	ret = SR_OK;
 	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_REGULATION:
 		*data = g_variant_new_string("CC"); /* Always CC mode. */
 		break;
@@ -299,11 +287,7 @@ static int config_set(uint32_t key, GVariant *data,
 	ret = SR_OK;
 	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;
+		return sr_sw_limits_config_set(&devc->limits, key, data);
 	case SR_CONF_ENABLED:
 		ret = reloadpro_set_on_off(sdi, g_variant_get_boolean(data));
 		break;
@@ -342,12 +326,11 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	serial_source_add(sdi->session, serial, G_IO_IN, 100,
 			  reloadpro_receive_data, (void *)sdi);
 
-	std_session_send_df_header(sdi, LOG_PREFIX);
+	sr_sw_limits_acquisition_start(&devc->limits);
+	std_session_send_df_header(sdi);
 
 	memset(devc->buf, 0, RELOADPRO_BUFSIZE);
 	devc->buflen = 0;
-	devc->num_samples = 0;
-	devc->starttime = g_get_monotonic_time();
 
 	return SR_OK;
 }
@@ -355,7 +338,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 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);
+		std_serial_dev_close);
 }
 
 static struct sr_dev_driver arachnid_labs_re_load_pro_driver_info = {