X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Fmaynuo-m97%2Fapi.c;h=54444d623c6d1484bfbe31f3da3d99d512a91c33;hp=876150a28609ea78ced4be63fc7066fcc5d9ffba;hb=HEAD;hpb=f778bf02eaf0d7fa7ccb91a0da8a68233f1fb79a

diff --git a/src/hardware/maynuo-m97/api.c b/src/hardware/maynuo-m97/api.c
index 876150a2..20a922fa 100644
--- a/src/hardware/maynuo-m97/api.c
+++ b/src/hardware/maynuo-m97/api.c
@@ -23,7 +23,7 @@
 static const uint32_t scanopts[] = {
 	SR_CONF_CONN,
 	SR_CONF_SERIALCOMM,
-	SR_CONF_MODBUSADDR
+	SR_CONF_MODBUSADDR,
 };
 
 static const uint32_t drvopts[] = {
@@ -140,14 +140,12 @@ static struct sr_dev_inst *probe_device(struct sr_modbus_dev_inst *modbus)
 	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);
+	sdi->version = g_strdup_printf("v%d.%d", version / 10, version % 10);
 	sdi->conn = modbus;
 	sdi->driver = &maynuo_m97_driver_info;
 	sdi->inst_type = SR_INST_MODBUS;
 
-	cg = g_malloc0(sizeof(struct sr_channel_group));
-	cg->name = g_strdup("1");
-	sdi->channel_groups = g_slist_append(sdi->channel_groups, cg);
+	cg = sr_channel_group_new(sdi, "1", NULL);
 
 	ch = sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "V1");
 	cg->channels = g_slist_append(cg->channels, ch);
@@ -232,8 +230,8 @@ static int dev_close(struct sr_dev_inst *sdi)
 	return sr_modbus_close(modbus);
 }
 
-static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
-		const struct sr_channel_group *cg)
+static int config_get(uint32_t key, GVariant **data,
+	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
 	struct dev_context *devc;
 	struct sr_modbus_dev_inst *modbus;
@@ -316,107 +314,68 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 	return ret;
 }
 
-static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
-		const struct sr_channel_group *cg)
+static int config_set(uint32_t key, GVariant *data,
+	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
 	struct dev_context *devc;
 	struct sr_modbus_dev_inst *modbus;
-	int ret;
 
 	(void)cg;
 
 	modbus = sdi->conn;
 	devc = sdi->priv;
 
-	ret = SR_OK;
 	switch (key) {
 	case SR_CONF_LIMIT_SAMPLES:
 	case SR_CONF_LIMIT_MSEC:
-		ret = sr_sw_limits_config_set(&devc->limits, key, data);
-		break;
+		return sr_sw_limits_config_set(&devc->limits, key, data);
 	case SR_CONF_ENABLED:
-		ret = maynuo_m97_set_input(modbus, g_variant_get_boolean(data));
-		break;
+		return maynuo_m97_set_input(modbus, g_variant_get_boolean(data));
 	case SR_CONF_VOLTAGE_TARGET:
-		ret = maynuo_m97_set_float(modbus, UFIX, g_variant_get_double(data));
-		break;
+		return maynuo_m97_set_float(modbus, UFIX, g_variant_get_double(data));
 	case SR_CONF_CURRENT_LIMIT:
-		ret = maynuo_m97_set_float(modbus, IFIX, g_variant_get_double(data));
-		break;
+		return maynuo_m97_set_float(modbus, IFIX, g_variant_get_double(data));
 	case SR_CONF_OVER_VOLTAGE_PROTECTION_THRESHOLD:
-		ret = maynuo_m97_set_float(modbus, UMAX, g_variant_get_double(data));
-		break;
+		return maynuo_m97_set_float(modbus, UMAX, g_variant_get_double(data));
 	case SR_CONF_OVER_CURRENT_PROTECTION_THRESHOLD:
-		ret = maynuo_m97_set_float(modbus, IMAX, g_variant_get_double(data));
-		break;
+		return maynuo_m97_set_float(modbus, IMAX, g_variant_get_double(data));
 	default:
-		ret = SR_ERR_NA;
+		return SR_ERR_NA;
 	}
 
-	return ret;
+	return SR_OK;
 }
 
-static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
-		const struct sr_channel_group *cg)
+static int config_list(uint32_t key, GVariant **data,
+	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
 	struct dev_context *devc;
-	GVariantBuilder gvb;
-	int ret;
 
-	/* Always available, even without sdi. */
-	if (key == SR_CONF_SCAN_OPTIONS) {
-		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-				scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
-		return SR_OK;
-	} else if (key == SR_CONF_DEVICE_OPTIONS && !sdi) {
-		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-				drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t));
-		return SR_OK;
-	}
-
-	if (!sdi)
-		return SR_ERR_ARG;
-	devc = sdi->priv;
+	devc = (sdi) ? sdi->priv : NULL;
 
-	ret = SR_OK;
 	if (!cg) {
-		/* No channel group: global options. */
-		switch (key) {
-		case SR_CONF_DEVICE_OPTIONS:
-			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-					devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
-			break;
-		default:
-			return SR_ERR_NA;
-		}
+		return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
 	} else {
 		switch (key) {
 		case SR_CONF_DEVICE_OPTIONS:
-			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-					devopts_cg, ARRAY_SIZE(devopts_cg), sizeof(uint32_t));
+			*data = std_gvar_array_u32(ARRAY_AND_SIZE(devopts_cg));
 			break;
 		case SR_CONF_VOLTAGE_TARGET:
-			g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
-			/* Min, max, write resolution. */
-			g_variant_builder_add_value(&gvb, g_variant_new_double(0.0));
-			g_variant_builder_add_value(&gvb, g_variant_new_double(devc->model->max_voltage));
-			g_variant_builder_add_value(&gvb, g_variant_new_double(0.001));
-			*data = g_variant_builder_end(&gvb);
+			if (!devc || !devc->model)
+				return SR_ERR_ARG;
+			*data = std_gvar_min_max_step(0.0, devc->model->max_voltage, 0.001);
 			break;
 		case SR_CONF_CURRENT_LIMIT:
-			g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
-			/* Min, max, step. */
-			g_variant_builder_add_value(&gvb, g_variant_new_double(0.0));
-			g_variant_builder_add_value(&gvb, g_variant_new_double(devc->model->max_current));
-			g_variant_builder_add_value(&gvb, g_variant_new_double(0.0001));
-			*data = g_variant_builder_end(&gvb);
+			if (!devc || !devc->model)
+				return SR_ERR_ARG;
+			*data = std_gvar_min_max_step(0.0, devc->model->max_current, 0.0001);
 			break;
 		default:
 			return SR_ERR_NA;
 		}
 	}
 
-	return ret;
+	return SR_OK;
 }
 
 static int dev_acquisition_start(const struct sr_dev_inst *sdi)