drivers: Always use same scanopts/drvopts/devopts/devopts_cg* order.

[libsigrok.git] / src / hardware / kecheng-kc-330b / api.c

diff --git a/src/hardware/kecheng-kc-330b/api.c b/src/hardware/kecheng-kc-330b/api.c
index 15dda4e09d72a96b91510881a10ebb978c1255c6..b3ca2bb39ee2324d0871bfffc4ef658d5451eabe 100644 (file)
--- a/src/hardware/kecheng-kc-330b/api.c
+++ b/src/hardware/kecheng-kc-330b/api.c
@@ -253,13 +253,12 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
        struct dev_context *devc;
        uint64_t p, q;
        unsigned int i;
-       int tmp, ret;
+       int tmp;
        const char *tmp_str;
 
        (void)cg;
 
        devc = sdi->priv;
-       ret = SR_OK;
        switch (key) {
        case SR_CONF_LIMIT_SAMPLES:
                devc->limit_samples = g_variant_get_uint64(data);
@@ -276,7 +275,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
                        break;
                }
                if (i == ARRAY_SIZE(kecheng_kc_330b_sample_intervals))
-                       ret = SR_ERR_ARG;
+                       return SR_ERR_ARG;
                break;
        case SR_CONF_SPL_WEIGHT_FREQ:
                tmp_str = g_variant_get_string(data, NULL);
@@ -313,10 +312,10 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
                devc->config_dirty = TRUE;
                break;
        default:
-               ret = SR_ERR_NA;
+               return SR_ERR_NA;
        }
 
-       return ret;
+       return SR_OK;
 }
 
 static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
@@ -326,14 +325,9 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
        GVariantBuilder gvb;
        unsigned int i;
 
-       (void)sdi;
-       (void)cg;
-
        switch (key) {
        case SR_CONF_DEVICE_OPTIONS:
-               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-                               devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
-               break;
+               return STD_CONFIG_LIST(key, data, sdi, cg, NULL, NULL, devopts);
        case SR_CONF_SAMPLE_INTERVAL:
                g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
                for (i = 0; i < ARRAY_SIZE(kecheng_kc_330b_sample_intervals); i++) {