X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fsysclk-lwla%2Fapi.c;h=127324f2d1489500dcfc0c2e427f09f9fb664e7a;hb=53012da658ae94b245240c8a3e115723eede4c7d;hp=71a358b98a05e122c089cabf4264c4948d4c9c40;hpb=ca314e060f653e6a0b5ec0f58914bac4d426217f;p=libsigrok.git

diff --git a/src/hardware/sysclk-lwla/api.c b/src/hardware/sysclk-lwla/api.c
index 71a358b9..127324f2 100644
--- a/src/hardware/sysclk-lwla/api.c
+++ b/src/hardware/sysclk-lwla/api.c
@@ -448,22 +448,19 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 			? CLOCK_EXT_CLK : CLOCK_INTERNAL;
 		break;
 	case SR_CONF_CLOCK_EDGE:
-		idx = lookup_index(data, signal_edge_names,
-				   ARRAY_SIZE(signal_edge_names));
+		idx = lookup_index(data, ARRAY_AND_SIZE(signal_edge_names));
 		if (idx < 0)
 			return SR_ERR_ARG;
 		devc->cfg_clock_edge = idx;
 		break;
 	case SR_CONF_TRIGGER_SOURCE:
-		idx = lookup_index(data, trigger_source_names,
-				   ARRAY_SIZE(trigger_source_names));
+		idx = lookup_index(data, ARRAY_AND_SIZE(trigger_source_names));
 		if (idx < 0)
 			return SR_ERR_ARG;
 		devc->cfg_trigger_source = idx;
 		break;
 	case SR_CONF_TRIGGER_SLOPE:
-		idx = lookup_index(data, signal_edge_names,
-				   ARRAY_SIZE(signal_edge_names));
+		idx = lookup_index(data, ARRAY_AND_SIZE(signal_edge_names));
 		if (idx < 0)
 			return SR_ERR_ARG;
 		devc->cfg_trigger_slope = idx;
@@ -600,8 +597,6 @@ static int config_list(uint32_t key, GVariant **data,
 		       const struct sr_channel_group *cg)
 {
 	struct dev_context *devc;
-	GVariant *gvar;
-	GVariantBuilder gvb;
 
 	devc = (sdi) ? sdi->priv : NULL;
 
@@ -609,8 +604,7 @@ static int config_list(uint32_t key, GVariant **data,
 	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->model->devopts : NULL,
 			(devc) ? devc->model->num_devopts : 0);
 	}
@@ -620,26 +614,17 @@ static int config_list(uint32_t key, GVariant **data,
 
 	switch (key) {
 	case SR_CONF_SAMPLERATE:
-		g_variant_builder_init(&gvb, G_VARIANT_TYPE_VARDICT);
-		gvar = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT64,
-			devc->model->samplerates, devc->model->num_samplerates,
-			sizeof(devc->model->samplerates[0]));
-		g_variant_builder_add(&gvb, "{sv}", "samplerates", gvar);
-		*data = g_variant_builder_end(&gvb);
+		*data = std_gvar_samplerates(devc->model->samplerates, devc->model->num_samplerates);
 		break;
 	case SR_CONF_TRIGGER_MATCH:
-		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
-			trigger_matches, ARRAY_SIZE(trigger_matches),
-			sizeof(trigger_matches[0]));
+		*data = std_gvar_array_i32(ARRAY_AND_SIZE(trigger_matches));
 		break;
 	case SR_CONF_TRIGGER_SOURCE:
-		*data = g_variant_new_strv(trigger_source_names,
-			ARRAY_SIZE(trigger_source_names));
+		*data = g_variant_new_strv(ARRAY_AND_SIZE(trigger_source_names));
 		break;
 	case SR_CONF_TRIGGER_SLOPE:
 	case SR_CONF_CLOCK_EDGE:
-		*data = g_variant_new_strv(signal_edge_names,
-			ARRAY_SIZE(signal_edge_names));
+		*data = g_variant_new_strv(ARRAY_AND_SIZE(signal_edge_names));
 		break;
 	default:
 		/* Must not happen for a key listed in devopts. */