drivers: Factor out std_gvar_tuple_double().

[libsigrok.git] / src / hardware / dreamsourcelab-dslogic / api.c

diff --git a/src/hardware/dreamsourcelab-dslogic/api.c b/src/hardware/dreamsourcelab-dslogic/api.c
index 6427cfdc7c5cb579d834fb43fab2ad7fc2faf9db..e57477f3f6da074a4c268f0f5187a3b88d0a1f21 100644 (file)
--- a/src/hardware/dreamsourcelab-dslogic/api.c
+++ b/src/hardware/dreamsourcelab-dslogic/api.c
@@ -383,7 +383,6 @@ 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];
 
@@ -415,16 +414,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);
@@ -535,8 +529,7 @@ static int config_set(uint32_t key, GVariant *data,
                devc->continuous_mode = g_variant_get_boolean(data);
                break;
        case SR_CONF_CLOCK_EDGE:
-               i = lookup_index(data, signal_edge_names,
-                                  ARRAY_SIZE(signal_edge_names));
+               i = lookup_index(data, ARRAY_AND_SIZE(signal_edge_names));
                if (i < 0)
                        return SR_ERR_ARG;
                devc->clock_edge = i;
@@ -555,7 +548,6 @@ static int config_list(uint32_t key, GVariant **data,
        GVariant *gvar, *range[2];
        GVariantBuilder gvb;
        unsigned int i;
-       double v;
 
        devc = (sdi) ? sdi->priv : NULL;
 
@@ -564,34 +556,24 @@ 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:
-               g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
                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 {
-                       for (v = 0.0; v <= 5.0; v += 0.1) {
-                               range[0] = g_variant_new_double(v);
-                               range[1] = g_variant_new_double(v);
-                               gvar = g_variant_new_tuple(range, 2);
-                               g_variant_builder_add_value(&gvb, gvar);
-                       }
+                       *data = std_gvar_min_max_step_thresholds(0.0, 5.0, 0.1);
                }
-               *data = g_variant_builder_end(&gvb);
                break;
        case SR_CONF_SAMPLERATE:
-               g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}"));
-               gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"), devc->samplerates,
-                               devc->num_samplerates, sizeof(uint64_t));
-               g_variant_builder_add(&gvb, "{sv}", "samplerates", gvar);
-               *data = g_variant_builder_end(&gvb);
+               *data = std_gvar_samplerates(devc->samplerates, devc->num_samplerates);
                break;
        case SR_CONF_CLOCK_EDGE:
-               *data = g_variant_new_strv(signal_edge_names,
-                       ARRAY_SIZE(signal_edge_names));
+               *data = g_variant_new_strv(ARRAY_AND_SIZE(signal_edge_names));
                break;
        default:
                return SR_ERR_NA;