X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fsaleae-logic16%2Fapi.c;h=e66d845b9f6d41189fa4dddbaed8bcd517cba7b9;hb=697fb6ddfc2522b2e6d35511c7837e2c61d8ae73;hp=7a7c157d780ad25f2049a4c417660707e66394f3;hpb=dd7a72ea697a172032f5473b0ddff5e8d47222f4;p=libsigrok.git

diff --git a/src/hardware/saleae-logic16/api.c b/src/hardware/saleae-logic16/api.c
index 7a7c157d..e66d845b 100644
--- a/src/hardware/saleae-logic16/api.c
+++ b/src/hardware/saleae-logic16/api.c
@@ -72,11 +72,14 @@ static const char *channel_names[] = {
 
 static const struct {
 	enum voltage_range range;
-	gdouble low;
-	gdouble high;
-} volt_thresholds[] = {
-	{ VOLTAGE_RANGE_18_33_V, 0.7, 1.4 },
-	{ VOLTAGE_RANGE_5_V,     1.4, 3.6 },
+} volt_thresholds_ranges[] = {
+	{ VOLTAGE_RANGE_18_33_V, },
+	{ VOLTAGE_RANGE_5_V, },
+};
+
+static const double volt_thresholds[][2] = {
+	{ 0.7, 1.4 },
+	{ 1.4, 3.6 },
 };
 
 static const uint64_t samplerates[] = {
@@ -400,8 +403,6 @@ static int config_get(uint32_t key, GVariant **data,
 {
 	struct dev_context *devc;
 	struct sr_usb_dev_inst *usb;
-	GVariant *range[2];
-	char str[128];
 	int ret;
 	unsigned int i;
 
@@ -417,8 +418,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_SAMPLERATE:
 		if (!sdi)
@@ -439,11 +439,9 @@ static int config_get(uint32_t key, GVariant **data,
 		ret = SR_ERR;
 		for (i = 0; i < ARRAY_SIZE(volt_thresholds); i++) {
 			if (devc->selected_voltage_range !=
-			    volt_thresholds[i].range)
+			    volt_thresholds_ranges[i].range)
 				continue;
-			range[0] = g_variant_new_double(volt_thresholds[i].low);
-			range[1] = g_variant_new_double(volt_thresholds[i].high);
-			*data = g_variant_new_tuple(range, 2);
+			*data = std_gvar_tuple_double(volt_thresholds[i][0], volt_thresholds[i][1]);
 			ret = SR_OK;
 			break;
 		}
@@ -459,9 +457,7 @@ 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;
-	int ret;
-	unsigned int i;
+	int ret, idx;
 
 	(void)cg;
 
@@ -480,17 +476,9 @@ static int config_set(uint32_t key, GVariant *data,
 		ret = (devc->capture_ratio > 100) ? SR_ERR : SR_OK;
 		break;
 	case SR_CONF_VOLTAGE_THRESHOLD:
-		g_variant_get(data, "(dd)", &low, &high);
-		ret = SR_ERR_ARG;
-		for (i = 0; i < ARRAY_SIZE(volt_thresholds); i++) {
-			if (fabs(volt_thresholds[i].low - low) < 0.1 &&
-			    fabs(volt_thresholds[i].high - high) < 0.1) {
-				devc->selected_voltage_range =
-					volt_thresholds[i].range;
-				ret = SR_OK;
-				break;
-			}
-		}
+		if ((idx = std_double_tuple_idx(data, ARRAY_AND_SIZE(volt_thresholds))) < 0)
+			return SR_ERR_ARG;
+		devc->selected_voltage_range = volt_thresholds_ranges[idx].range;
 		break;
 	default:
 		ret = SR_ERR_NA;
@@ -502,10 +490,6 @@ static int config_set(uint32_t key, GVariant *data,
 static int config_list(uint32_t key, GVariant **data,
 	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
-	GVariant *gvar, *range[2];
-	GVariantBuilder gvb;
-	unsigned int i;
-
 	switch (key) {
 	case SR_CONF_SCAN_OPTIONS:
 	case SR_CONF_DEVICE_OPTIONS:
@@ -514,14 +498,7 @@ static int config_list(uint32_t key, GVariant **data,
 		*data = std_gvar_samplerates(ARRAY_AND_SIZE(samplerates));
 		break;
 	case SR_CONF_VOLTAGE_THRESHOLD:
-		g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
-		for (i = 0; i < ARRAY_SIZE(volt_thresholds); i++) {
-			range[0] = g_variant_new_double(volt_thresholds[i].low);
-			range[1] = g_variant_new_double(volt_thresholds[i].high);
-			gvar = g_variant_new_tuple(range, 2);
-			g_variant_builder_add_value(&gvb, gvar);
-		}
-		*data = g_variant_builder_end(&gvb);
+		*data = std_gvar_thresholds(ARRAY_AND_SIZE(volt_thresholds));
 		break;
 	case SR_CONF_TRIGGER_MATCH:
 		*data = std_gvar_array_i32(ARRAY_AND_SIZE(trigger_matches));