drivers: Factor out std_gvar_array_*().

[libsigrok.git] / src / hardware / scpi-pps / api.c

diff --git a/src/hardware/scpi-pps/api.c b/src/hardware/scpi-pps/api.c
index 707d26263198c4f039c8d61b73e1a5ef49957325..5a847eb2257c81e342701589f57446f13e414543 100644 (file)
--- a/src/hardware/scpi-pps/api.c
+++ b/src/hardware/scpi-pps/api.c
@@ -288,19 +288,15 @@ static int dev_close(struct sr_dev_inst *sdi)
        return sr_scpi_close(scpi);
 }
 
-static void clear_helper(void *priv)
+static void clear_helper(struct dev_context *devc)
 {
-       struct dev_context *devc;
-
-       devc = priv;
        g_free(devc->channels);
        g_free(devc->channel_groups);
-       g_free(devc);
 }
 
 static int dev_clear(const struct sr_dev_driver *di)
 {
-       return std_dev_clear(di, clear_helper);
+       return std_dev_clear_with_callback(di, (std_dev_clear_callback)clear_helper);
 }
 
 static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
@@ -443,7 +439,6 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
                return SR_ERR_ARG;
 
        if (cg)
-               /* Channel group specified. */
                select_channel(sdi, cg->channels->data);
 
        devc = sdi->priv;
@@ -519,34 +514,20 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
        struct dev_context *devc;
        struct sr_channel *ch;
        const struct channel_spec *ch_spec;
-       GVariant *gvar;
-       GVariantBuilder gvb;
-       int ret, i;
+       int i;
        const char *s[16];
 
-       /* Always available, even without sdi. */
-       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;
-       } else 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;
-       devc = sdi->priv;
+       devc = (sdi) ? sdi->priv : NULL;
 
-       ret = SR_OK;
        if (!cg) {
-               /* No channel group: global options. */
                switch (key) {
+               case SR_CONF_SCAN_OPTIONS:
                case SR_CONF_DEVICE_OPTIONS:
-                       *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-                                       devc->device->devopts, devc->device->num_devopts,
-                                       sizeof(uint32_t));
+                       return std_opts_config_list(key, data, sdi, cg,
+                               scanopts, ARRAY_SIZE(scanopts),
+                               drvopts, ARRAY_SIZE(drvopts),
+                               (devc) ? devc->device->devopts : NULL,
+                               (devc) ? devc->device->num_devopts : 0);
                        break;
                case SR_CONF_CHANNEL_CONFIG:
                        /* Not used. */
@@ -570,7 +551,6 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
                        return SR_ERR_NA;
                }
        } else {
-               /* Channel group specified. */
                /*
                 * Per-channel-group options depending on a channel are actually
                 * done with the first channel. Channel groups in PPS can have
@@ -578,49 +558,27 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
                 * specification for use in series or parallel mode.
                 */
                ch = cg->channels->data;
+               ch_spec = &(devc->device->channels[ch->index]);
 
                switch (key) {
                case SR_CONF_DEVICE_OPTIONS:
-                       *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-                                       devc->device->devopts_cg, devc->device->num_devopts_cg,
-                                       sizeof(uint32_t));
+                       *data = std_gvar_array_u32(devc->device->devopts_cg, devc->device->num_devopts_cg);
                        break;
                case SR_CONF_VOLTAGE_TARGET:
-                       ch_spec = &(devc->device->channels[ch->index]);
-                       g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
-                       /* Min, max, write resolution. */
-                       for (i = 0; i < 3; i++) {
-                               gvar = g_variant_new_double(ch_spec->voltage[i]);
-                               g_variant_builder_add_value(&gvb, gvar);
-                       }
-                       *data = g_variant_builder_end(&gvb);
+                       *data = std_gvar_min_max_step_array(ch_spec->voltage);
                        break;
                case SR_CONF_OUTPUT_FREQUENCY_TARGET:
-                       ch_spec = &(devc->device->channels[ch->index]);
-                       g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
-                       /* Min, max, write resolution. */
-                       for (i = 0; i < 3; i++) {
-                               gvar = g_variant_new_double(ch_spec->frequency[i]);
-                               g_variant_builder_add_value(&gvb, gvar);
-                       }
-                       *data = g_variant_builder_end(&gvb);
+                       *data = std_gvar_min_max_step_array(ch_spec->frequency);
                        break;
                case SR_CONF_CURRENT_LIMIT:
-                       g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
-                       /* Min, max, step. */
-                       for (i = 0; i < 3; i++) {
-                               ch_spec = &(devc->device->channels[ch->index]);
-                               gvar = g_variant_new_double(ch_spec->current[i]);
-                               g_variant_builder_add_value(&gvb, gvar);
-                       }
-                       *data = g_variant_builder_end(&gvb);
+                       *data = std_gvar_min_max_step_array(ch_spec->current);
                        break;
                default:
                        return SR_ERR_NA;
                }
        }
 
-       return ret;
+       return SR_OK;
 }
 
 static int dev_acquisition_start(const struct sr_dev_inst *sdi)
@@ -662,7 +620,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
        struct sr_scpi_dev_inst *scpi;
-       float f;
+       double d;
 
        scpi = sdi->conn;
 
@@ -671,7 +629,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
         * to avoid leaving the device in a state where it's not expecting
         * commands.
         */
-       sr_scpi_get_float(scpi, NULL, &f);
+       sr_scpi_get_double(scpi, NULL, &d);
        sr_scpi_source_remove(sdi->session, scpi);
 
        std_session_send_df_end(sdi);