drivers: Replace struct voltage_threshold with an array.

[libsigrok.git] / src / hardware / cem-dt-885x / api.c

diff --git a/src/hardware/cem-dt-885x/api.c b/src/hardware/cem-dt-885x/api.c
index d7a75b6003e372cbb3a5e8806733f15293565a8d..a4d4c091e7bd7a7ddf13502d4b427aa2faebe735 100644 (file)
--- a/src/hardware/cem-dt-885x/api.c
+++ b/src/hardware/cem-dt-885x/api.c
@@ -125,11 +125,10 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        return std_scan_complete(di, devices);
 }
 
-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];
        uint64_t low, high;
        int tmp, ret;
 
@@ -175,11 +174,8 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
                        *data = g_variant_new_boolean(tmp == SR_MQFLAG_MIN);
                break;
        case SR_CONF_SPL_MEASUREMENT_RANGE:
-               if ((ret = cem_dt_885x_meas_range_get(sdi, &low, &high)) == SR_OK) {
-                       range[0] = g_variant_new_uint64(low);
-                       range[1] = g_variant_new_uint64(high);
-                       *data = g_variant_new_tuple(range, 2);
-               }
+               if ((ret = cem_dt_885x_meas_range_get(sdi, &low, &high)) == SR_OK)
+                       *data = std_gvar_tuple_u64(low, high);
                break;
        case SR_CONF_POWER_OFF:
                *data = g_variant_new_boolean(FALSE);
@@ -197,8 +193,8 @@ 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;
        uint64_t tmp_u64, low, high;
@@ -281,8 +277,8 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
        return ret;
 }
 
-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)
 {
        switch (key) {
        case SR_CONF_SCAN_OPTIONS:
@@ -295,7 +291,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
                *data = g_variant_new_strv(ARRAY_AND_SIZE(weight_time));
                break;
        case SR_CONF_SPL_MEASUREMENT_RANGE:
-               *data = std_gvar_tuple_array(&meas_ranges, ARRAY_SIZE(meas_ranges));
+               *data = std_gvar_tuple_array(ARRAY_AND_SIZE(meas_ranges));
                break;
        case SR_CONF_DATA_SOURCE:
                *data = g_variant_new_strv(ARRAY_AND_SIZE(data_sources));