X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fdemo%2Fapi.c;h=fcf61cb3f54d1c2b9727a50cd4e7579d835fb2b6;hb=58ffcf97121453fb53e885338e23e54c7ed78659;hp=ed3d0c352398f359e30e8e36180c5cd0a74820ee;hpb=55fb76b34826a287240bebeeda688e4c465b4751;p=libsigrok.git

diff --git a/src/hardware/demo/api.c b/src/hardware/demo/api.c
index ed3d0c35..fcf61cb3 100644
--- a/src/hardware/demo/api.c
+++ b/src/hardware/demo/api.c
@@ -355,8 +355,6 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 		const struct sr_channel_group *cg)
 {
 	struct sr_channel *ch;
-	GVariant *gvar;
-	GVariantBuilder gvb;
 
 	if (!cg) {
 		switch (key) {
@@ -364,11 +362,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 		case SR_CONF_DEVICE_OPTIONS:
 			return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, 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;
@@ -378,18 +372,12 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 		switch (key) {
 		case SR_CONF_DEVICE_OPTIONS:
 			if (ch->type == SR_CHANNEL_LOGIC)
-				*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-						devopts_cg_logic, ARRAY_SIZE(devopts_cg_logic),
-						sizeof(uint32_t));
+				*data = std_gvar_array_u32(ARRAY_AND_SIZE(devopts_cg_logic));
 			else if (ch->type == SR_CHANNEL_ANALOG) {
 				if (strcmp(cg->name, "Analog") == 0)
-					*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-							devopts_cg_analog_group, ARRAY_SIZE(devopts_cg_analog_group),
-							sizeof(uint32_t));
+					*data = std_gvar_array_u32(ARRAY_AND_SIZE(devopts_cg_analog_group));
 				else
-					*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-							devopts_cg_analog_channel, ARRAY_SIZE(devopts_cg_analog_channel),
-							sizeof(uint32_t));
+					*data = std_gvar_array_u32(ARRAY_AND_SIZE(devopts_cg_analog_channel));
 			}
 			else
 				return SR_ERR_BUG;
@@ -400,11 +388,9 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 				return SR_ERR_NA;
 
 			if (ch->type == SR_CHANNEL_LOGIC)
-				*data = g_variant_new_strv(logic_pattern_str,
-						ARRAY_SIZE(logic_pattern_str));
+				*data = g_variant_new_strv(ARRAY_AND_SIZE(logic_pattern_str));
 			else if (ch->type == SR_CHANNEL_ANALOG)
-				*data = g_variant_new_strv(analog_pattern_str,
-						ARRAY_SIZE(analog_pattern_str));
+				*data = g_variant_new_strv(ARRAY_AND_SIZE(analog_pattern_str));
 			else
 				return SR_ERR_BUG;
 			break;