X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fbaylibre-acme%2Fapi.c;h=4438c64274516df43a4650bf5ed1976caa8d3eda;hb=105df67463b84683a35f3474eccc871e5aa4ed0e;hp=bc93ae7520cebf446f3d7349d00696521fb2c80b;hpb=e66d1892d0dd16ed166fc8f13493f95de0607362;p=libsigrok.git

diff --git a/src/hardware/baylibre-acme/api.c b/src/hardware/baylibre-acme/api.c
index bc93ae75..4438c642 100644
--- a/src/hardware/baylibre-acme/api.c
+++ b/src/hardware/baylibre-acme/api.c
@@ -22,6 +22,11 @@
 #include <time.h>
 #include <sys/timerfd.h>
 
+static const uint32_t drvopts[] = {
+	SR_CONF_THERMOMETER,
+	SR_CONF_POWERMETER,
+};
+
 static const uint32_t devopts[] = {
 	SR_CONF_CONTINUOUS,
 	SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
@@ -215,21 +220,14 @@ 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) {
 		switch (key) {
 		case SR_CONF_DEVICE_OPTIONS:
-			return STD_CONFIG_LIST(key, data, sdi, cg, NULL, NULL, devopts);
+			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(samplerates, ARRAY_SIZE(samplerates));
 			break;
 		default:
 			return SR_ERR_NA;
@@ -242,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;