drivers: Use ARRAY_AND_SIZE where possible.

[libsigrok.git] / src / hardware / baylibre-acme / api.c

diff --git a/src/hardware/baylibre-acme/api.c b/src/hardware/baylibre-acme/api.c
index 22a0c9b8b37d0035c88f244a3e6dbbebcb72e228..e96bff27b5eacb69d8f108da1b2adf52eb5a9e4d 100644 (file)
--- a/src/hardware/baylibre-acme/api.c
+++ b/src/hardware/baylibre-acme/api.c
@@ -24,6 +24,7 @@
 
 static const uint32_t drvopts[] = {
        SR_CONF_THERMOMETER,
+       SR_CONF_POWERMETER,
 };
 
 static const uint32_t devopts[] = {
@@ -219,8 +220,6 @@ static int config_list(uint32_t key, GVariant **data,
                       const struct sr_channel_group *cg)
 {
        uint32_t devopts_cg[MAX_DEVOPTS_CG];
-       GVariant *gvar;
-       GVariantBuilder gvb;
        int num_devopts_cg = 0;
 
        if (!cg) {
@@ -228,12 +227,7 @@ static int config_list(uint32_t key, GVariant **data,
                case SR_CONF_DEVICE_OPTIONS:
                        return STD_CONFIG_LIST(key, data, sdi, cg, NULL, drvopts, devopts);
                case SR_CONF_SAMPLERATE:
-                       g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}"));
-                       gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"),
-                               samplerates, ARRAY_SIZE(samplerates), sizeof(uint64_t));
-                       g_variant_builder_add(&gvb, "{sv}",
-                                             "samplerate-steps", gvar);
-                       *data = g_variant_builder_end(&gvb);
+                       *data = std_gvar_samplerates_steps(ARRAY_AND_SIZE(samplerates));
                        break;
                default:
                        return SR_ERR_NA;
@@ -246,8 +240,7 @@ static int config_list(uint32_t key, GVariant **data,
                        if (bl_acme_probe_has_pws(cg))
                                devopts_cg[num_devopts_cg++] = HAS_POWER_OFF;
 
-                       *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-                               devopts_cg, num_devopts_cg, sizeof(uint32_t));
+                       *data = std_gvar_array_u32(devopts_cg, num_devopts_cg);
                        break;
                default:
                        return SR_ERR_NA;