drivers: Factor out std_gvar_samplerates{,_steps}().

[libsigrok.git] / src / hardware / hantek-6xxx / api.c

diff --git a/src/hardware/hantek-6xxx/api.c b/src/hardware/hantek-6xxx/api.c
index aed2b970ae37489acac83bad492c03221e9f2a06..4f8e011285dd95b199f4c2b1bd751616252b77d5 100644 (file)
--- a/src/hardware/hantek-6xxx/api.c
+++ b/src/hardware/hantek-6xxx/api.c
@@ -458,8 +458,6 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
                const struct sr_channel_group *cg)
 {
-       GVariantBuilder gvb;
-       GVariant *gvar;
        struct dev_context *devc;
 
        devc = (sdi) ? sdi->priv : NULL;
@@ -470,12 +468,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
                case SR_CONF_DEVICE_OPTIONS:
                        return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
                case SR_CONF_SAMPLERATE:
-                       g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}"));
-                       gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"),
-                               samplerates, ARRAY_SIZE(samplerates),
-                               sizeof(uint64_t));
-                       g_variant_builder_add(&gvb, "{sv}", "samplerates", gvar);
-                       *data = g_variant_builder_end(&gvb);
+                       *data = std_gvar_samplerates(samplerates, ARRAY_SIZE(samplerates));
                        break;
                default:
                        return SR_ERR_NA;