drivers: Add and use STD_CONFIG_LIST().

[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 33dd5c754c66c82cd78caa70eb0ec547bfb06ec2..4bdbc076c212df008b086220766b43a7b2455dce 100644 (file)
--- a/src/hardware/cem-dt-885x/api.c
+++ b/src/hardware/cem-dt-885x/api.c
@@ -288,49 +288,31 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
        GVariantBuilder gvb;
        unsigned int i;
 
-       (void)cg;
-
-       if (!sdi) {
-               switch (key) {
-               case SR_CONF_SCAN_OPTIONS:
-                       *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-                                       scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
-                       break;
-               case SR_CONF_DEVICE_OPTIONS:
-                       *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-                                       drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t));
-                       break;
-               default:
-                       return SR_ERR_NA;
-               }
-       } else {
-               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;
-               case SR_CONF_SPL_WEIGHT_FREQ:
-                       *data = g_variant_new_strv(weight_freq, ARRAY_SIZE(weight_freq));
-                       break;
-               case SR_CONF_SPL_WEIGHT_TIME:
-                       *data = g_variant_new_strv(weight_time, ARRAY_SIZE(weight_time));
-                       break;
-               case SR_CONF_SPL_MEASUREMENT_RANGE:
-                       g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
-                       for (i = 0; i < ARRAY_SIZE(meas_ranges); i++) {
-                               range[0] = g_variant_new_uint64(meas_ranges[i][0]);
-                               range[1] = g_variant_new_uint64(meas_ranges[i][1]);
-                               tuple = g_variant_new_tuple(range, 2);
-                               g_variant_builder_add_value(&gvb, tuple);
-                       }
-                       *data = g_variant_builder_end(&gvb);
-                       break;
-               case SR_CONF_DATA_SOURCE:
-                       *data = g_variant_new_strv(data_sources, ARRAY_SIZE(data_sources));
-                       break;
-               default:
-                       return SR_ERR_NA;
+       switch (key) {
+       case SR_CONF_SCAN_OPTIONS:
+       case SR_CONF_DEVICE_OPTIONS:
+               return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
+       case SR_CONF_SPL_WEIGHT_FREQ:
+               *data = g_variant_new_strv(weight_freq, ARRAY_SIZE(weight_freq));
+               break;
+       case SR_CONF_SPL_WEIGHT_TIME:
+               *data = g_variant_new_strv(weight_time, ARRAY_SIZE(weight_time));
+               break;
+       case SR_CONF_SPL_MEASUREMENT_RANGE:
+               g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
+               for (i = 0; i < ARRAY_SIZE(meas_ranges); i++) {
+                       range[0] = g_variant_new_uint64(meas_ranges[i][0]);
+                       range[1] = g_variant_new_uint64(meas_ranges[i][1]);
+                       tuple = g_variant_new_tuple(range, 2);
+                       g_variant_builder_add_value(&gvb, tuple);
                }
+               *data = g_variant_builder_end(&gvb);
+               break;
+       case SR_CONF_DATA_SOURCE:
+               *data = g_variant_new_strv(data_sources, ARRAY_SIZE(data_sources));
+               break;
+       default:
+               return SR_ERR_NA;
        }
 
        return SR_OK;