X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fmaynuo-m97%2Fapi.c;h=7bf960d66ac11e244206f68056b4b2c8ed03003f;hb=41dc2547787ea571e1f0fb271eff964767c49203;hp=5716d3bd484f7c8ec6d84426689017a2c0123181;hpb=88a0265ebcb265ba839c02cc5bcd39e359c9f60f;p=libsigrok.git

diff --git a/src/hardware/maynuo-m97/api.c b/src/hardware/maynuo-m97/api.c
index 5716d3bd..7bf960d6 100644
--- a/src/hardware/maynuo-m97/api.c
+++ b/src/hardware/maynuo-m97/api.c
@@ -31,7 +31,7 @@ static const uint32_t drvopts[] = {
 };
 
 static const uint32_t devopts[] = {
-	SR_CONF_CONTINUOUS | SR_CONF_SET,
+	SR_CONF_CONTINUOUS,
 	SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
 	SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET,
 };
@@ -111,11 +111,6 @@ static const struct maynuo_m97_model supported_models[] = {
 
 SR_PRIV struct sr_dev_driver maynuo_m97_driver_info;
 
-static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
-{
-	return std_init(sr_ctx, di, LOG_PREFIX);
-}
-
 static struct sr_dev_inst *probe_device(struct sr_modbus_dev_inst *modbus)
 {
 	const struct maynuo_m97_model *model = NULL;
@@ -140,7 +135,7 @@ static struct sr_dev_inst *probe_device(struct sr_modbus_dev_inst *modbus)
 	}
 
 	sdi = g_malloc0(sizeof(struct sr_dev_inst));
-	sdi->status = SR_ST_ACTIVE;
+	sdi->status = SR_ST_INACTIVE;
 	sdi->vendor = g_strdup("Maynuo");
 	sdi->model = g_strdup(model->name);
 	sdi->version = g_strdup_printf("v%d.%d", version/10, version%10);
@@ -199,11 +194,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	return devices;
 }
 
-static GSList *dev_list(const struct sr_dev_driver *di)
-{
-	return ((struct drv_context *)(di->context))->instances;
-}
-
 static int dev_open(struct sr_dev_inst *sdi)
 {
 	struct sr_modbus_dev_inst *modbus = sdi->conn;
@@ -265,10 +255,8 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 	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);
+		ret = sr_sw_limits_config_get(&devc->limits, key, data);
 		break;
 	case SR_CONF_ENABLED:
 		if ((ret = maynuo_m97_get_bit(modbus, ISTATE, &ivalue)) == SR_OK)
@@ -352,10 +340,8 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 	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);
+		ret = sr_sw_limits_config_set(&devc->limits, key, data);
 		break;
 	case SR_CONF_ENABLED:
 		ret = maynuo_m97_set_input(modbus, g_variant_get_boolean(data));
@@ -458,11 +444,9 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 			maynuo_m97_receive_data, (void *)sdi)) != SR_OK)
 		return ret;
 
+	sr_sw_limits_acquisition_start(&devc->limits);
 	std_session_send_df_header(sdi, LOG_PREFIX);
 
-	devc->num_samples = 0;
-	devc->starttime = g_get_monotonic_time();
-
 	return maynuo_m97_capture_start(sdi);
 }
 
@@ -485,10 +469,10 @@ SR_PRIV struct sr_dev_driver maynuo_m97_driver_info = {
 	.name = "maynuo-m97",
 	.longname = "maynuo M97/M98 series",
 	.api_version = 1,
-	.init = init,
+	.init = std_init,
 	.cleanup = std_cleanup,
 	.scan = scan,
-	.dev_list = dev_list,
+	.dev_list = std_dev_list,
 	.config_get = config_get,
 	.config_set = config_set,
 	.config_list = config_list,