X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fzeroplus-logic-cube%2Fapi.c;h=d8067416286b47d7654cf3bb271a55c532972a09;hb=393375e1fee969e7c80feac0cb1df718bd652578;hp=c3ee8017fa554251d4759203bffe80a7c7acfd51;hpb=b15ff1c92aabeea04649de25a3a01f851ab0a1ec;p=libsigrok.git

diff --git a/src/hardware/zeroplus-logic-cube/api.c b/src/hardware/zeroplus-logic-cube/api.c
index c3ee8017..d8067416 100644
--- a/src/hardware/zeroplus-logic-cube/api.c
+++ b/src/hardware/zeroplus-logic-cube/api.c
@@ -327,11 +327,10 @@ static int dev_close(struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-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;
-	GVariant *range[2];
 
 	(void)cg;
 
@@ -348,9 +347,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 		*data = g_variant_new_uint64(devc->capture_ratio);
 		break;
 	case SR_CONF_VOLTAGE_THRESHOLD:
-		range[0] = g_variant_new_double(devc->cur_threshold);
-		range[1] = g_variant_new_double(devc->cur_threshold);
-		*data = g_variant_new_tuple(range, 2);
+		*data = std_gvar_tuple_double(devc->cur_threshold, devc->cur_threshold);
 		break;
 	default:
 		return SR_ERR_NA;
@@ -359,8 +356,8 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 	return SR_OK;
 }
 
-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;
 	gdouble low, high;
@@ -375,7 +372,8 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 	case SR_CONF_LIMIT_SAMPLES:
 		return set_limit_samples(devc, g_variant_get_uint64(data));
 	case SR_CONF_CAPTURE_RATIO:
-		return set_capture_ratio(devc, g_variant_get_uint64(data));
+		devc->capture_ratio = g_variant_get_uint64(data);
+		break;
 	case SR_CONF_VOLTAGE_THRESHOLD:
 		g_variant_get(data, "(dd)", &low, &high);
 		return set_voltage_threshold(devc, (low + high) / 2.0);
@@ -386,11 +384,10 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 	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;
-	GVariant *grange[2];
 
 	switch (key) {
 	case SR_CONF_DEVICE_OPTIONS:
@@ -417,9 +414,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 		if (!sdi)
 			return SR_ERR_ARG;
 		devc = sdi->priv;
-		grange[0] = g_variant_new_uint64(0);
-		grange[1] = g_variant_new_uint64(devc->max_sample_depth);
-		*data = g_variant_new_tuple(grange, 2);
+		*data = std_gvar_tuple_u64(0, devc->max_sample_depth);
 		break;
 	default:
 		return SR_ERR_NA;