drivers: Use ARRAY_AND_SIZE where possible.

[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 70b5435106846fffa65813b887efa34442c7484a..f97b07109eae6ffb66e105d764979620934b6bff 100644 (file)
--- a/src/hardware/scpi-pps/api.c
+++ b/src/hardware/scpi-pps/api.c
@@ -524,8 +524,8 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
                case SR_CONF_SCAN_OPTIONS:
                case SR_CONF_DEVICE_OPTIONS:
                        return std_opts_config_list(key, data, sdi, cg,
-                               scanopts, ARRAY_SIZE(scanopts),
-                               drvopts, ARRAY_SIZE(drvopts),
+                               ARRAY_AND_SIZE(scanopts),
+                               ARRAY_AND_SIZE(drvopts),
                                (devc) ? devc->device->devopts : NULL,
                                (devc) ? devc->device->num_devopts : 0);
                        break;
@@ -562,9 +562,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 
                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:
                        *data = std_gvar_min_max_step_array(ch_spec->voltage);
@@ -622,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;
 
@@ -631,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);