X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fdreamsourcelab-dslogic%2Fapi.c;h=65732d3a29875805581ce4c1c3faef10d2f60f00;hb=95c1fe62f77d347bf173b1236c38a9043efabd2b;hp=fe49d5f325f68ac0dec57946165fd539f548bebe;hpb=53012da658ae94b245240c8a3e115723eede4c7d;p=libsigrok.git

diff --git a/src/hardware/dreamsourcelab-dslogic/api.c b/src/hardware/dreamsourcelab-dslogic/api.c
index fe49d5f3..65732d3a 100644
--- a/src/hardware/dreamsourcelab-dslogic/api.c
+++ b/src/hardware/dreamsourcelab-dslogic/api.c
@@ -72,10 +72,7 @@ static const char *const signal_edge_names[] = {
 	[DS_EDGE_FALLING] = "falling",
 };
 
-static const struct {
-	gdouble low;
-	gdouble high;
-} voltage_thresholds[] = {
+static const struct voltage_threshold voltage_thresholds[] = {
 	{ 0.7, 1.4 },
 	{ 1.4, 3.6 },
 };
@@ -383,9 +380,7 @@ static int config_get(uint32_t key, GVariant **data,
 {
 	struct dev_context *devc;
 	struct sr_usb_dev_inst *usb;
-	GVariant *range[2];
 	unsigned int i, voltage_range;
-	char str[128];
 
 	(void)cg;
 
@@ -403,8 +398,7 @@ static int config_get(uint32_t key, GVariant **data,
 			/* Device still needs to re-enumerate after firmware
 			 * upload, so we don't know its (future) address. */
 			return SR_ERR;
-		snprintf(str, 128, "%d.%d", usb->bus, usb->address);
-		*data = g_variant_new_string(str);
+		*data = g_variant_new_printf("%d.%d", usb->bus, usb->address);
 		break;
 	case SR_CONF_VOLTAGE_THRESHOLD:
 		if (!strcmp(devc->profile->model, "DSLogic")) {
@@ -415,16 +409,11 @@ static int config_get(uint32_t key, GVariant **data,
 					voltage_range = i;
 					break;
 				}
-
-			range[0] = g_variant_new_double(
-				voltage_thresholds[voltage_range].low);
-			range[1] = g_variant_new_double(
-				voltage_thresholds[voltage_range].high);
+			*data = std_gvar_tuple_double(voltage_thresholds[voltage_range].low,
+					voltage_thresholds[voltage_range].high);
 		} else {
-			range[0] = g_variant_new_double(devc->cur_threshold);
-			range[1] = g_variant_new_double(devc->cur_threshold);
+			*data = std_gvar_tuple_double(devc->cur_threshold, devc->cur_threshold);
 		}
-		*data = g_variant_new_tuple(range, 2);
 		break;
 	case SR_CONF_LIMIT_SAMPLES:
 		*data = g_variant_new_uint64(devc->limit_samples);
@@ -551,9 +540,6 @@ 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 *gvar, *range[2];
-	GVariantBuilder gvb;
-	unsigned int i;
 
 	devc = (sdi) ? sdi->priv : NULL;
 
@@ -562,18 +548,10 @@ static int config_list(uint32_t key, GVariant **data,
 	case SR_CONF_DEVICE_OPTIONS:
 		return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
 	case SR_CONF_VOLTAGE_THRESHOLD:
-		if (!strcmp(devc->profile->model, "DSLogic")) {
-			g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
-			for (i = 0; i < ARRAY_SIZE(voltage_thresholds); i++) {
-				range[0] = g_variant_new_double(voltage_thresholds[i].low);
-				range[1] = g_variant_new_double(voltage_thresholds[i].high);
-				gvar = g_variant_new_tuple(range, 2);
-				g_variant_builder_add_value(&gvb, gvar);
-			}
-			*data = g_variant_builder_end(&gvb);
-		} else {
+		if (!strcmp(devc->profile->model, "DSLogic"))
+			*data = std_gvar_thresholds(ARRAY_AND_SIZE(voltage_thresholds));
+		else
 			*data = std_gvar_min_max_step_thresholds(0.0, 5.0, 0.1);
-		}
 		break;
 	case SR_CONF_SAMPLERATE:
 		*data = std_gvar_samplerates(devc->samplerates, devc->num_samplerates);