drivers: Factor out std_gvar_min_max_step{,_array}().

[libsigrok.git] / src / hardware / arachnid-labs-re-load-pro / api.c

diff --git a/src/hardware/arachnid-labs-re-load-pro/api.c b/src/hardware/arachnid-labs-re-load-pro/api.c
index 4fcd7b8541a1904df1dc90db45decba5b7386a86..48d3cb8fd5b0151d7d6a1414419e45a7f7786435 100644 (file)
--- a/src/hardware/arachnid-labs-re-load-pro/api.c
+++ b/src/hardware/arachnid-labs-re-load-pro/api.c
@@ -150,37 +150,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 static int config_list(uint32_t key, GVariant **data,
        const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
-       GVariantBuilder gvb;
-       int ret;
-
-       /* Always available. */
-       if (key == SR_CONF_SCAN_OPTIONS) {
-               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-                       scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
-               return SR_OK;
-       }
-
-       if (key == SR_CONF_DEVICE_OPTIONS && !sdi) {
-               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-                       drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t));
-               return SR_OK;
-       }
-
-       if (!sdi)
-               return SR_ERR_ARG;
-
-       ret = SR_OK;
-
        if (!cg) {
-               /* No channel group: global options. */
-               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;
-               default:
-                       return SR_ERR_NA;
-               }
+               return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
        } else {
                switch (key) {
                case SR_CONF_DEVICE_OPTIONS:
@@ -188,26 +159,20 @@ static int config_list(uint32_t key, GVariant **data,
                                devopts_cg, ARRAY_SIZE(devopts_cg), sizeof(uint32_t));
                        break;
                case SR_CONF_CURRENT_LIMIT:
-                       g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
-                       /* Min, max, step. */
-                       g_variant_builder_add_value(&gvb, g_variant_new_double(0.0));
-                       g_variant_builder_add_value(&gvb, g_variant_new_double(6.0));
-                       g_variant_builder_add_value(&gvb, g_variant_new_double(0.001)); /* 1mA steps */
-                       *data = g_variant_builder_end(&gvb);
+                       *data = std_gvar_min_max_step(0.0, 6.0, 0.001);
                        break;
                default:
                        return SR_ERR_NA;
                }
        }
 
-       return ret;
+       return SR_OK;
 }
 
 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;
-       int ret;
        float fvalue;
 
        (void)cg;
@@ -223,7 +188,6 @@ static int config_get(uint32_t key, GVariant **data,
         *  - SR_CONF_ENABLED (state cannot be queried, only set)
         */
 
-       ret = SR_OK;
        switch (key) {
        case SR_CONF_LIMIT_SAMPLES:
        case SR_CONF_LIMIT_MSEC:
@@ -267,7 +231,7 @@ static int config_get(uint32_t key, GVariant **data,
                return SR_ERR_NA;
        }
 
-       return ret;
+       return SR_OK;
 }
 
 static int config_set(uint32_t key, GVariant *data,
@@ -316,7 +280,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
                return SR_ERR;
        }
 
-       /* Poll every 100ms, or whenever some data comes in. */
        serial_source_add(sdi->session, serial, G_IO_IN, 100,
                          reloadpro_receive_data, (void *)sdi);