X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fhantek-dso%2Fapi.c;h=27f4f64f21f04956477327fc60a883e778f344c5;hb=9fb9afb573193a6614c45e3a040a3c92c713523a;hp=dc94f033c806c527e8277964dd3b83a983f15597;hpb=a9010323ddf4e479663e871386c05db05ea3522e;p=libsigrok.git

diff --git a/src/hardware/hantek-dso/api.c b/src/hardware/hantek-dso/api.c
index dc94f033..27f4f64f 100644
--- a/src/hardware/hantek-dso/api.c
+++ b/src/hardware/hantek-dso/api.c
@@ -144,21 +144,16 @@ static const uint64_t vdivs[][2] = {
 };
 
 static const char *trigger_sources[] = {
-	"CH1",
-	"CH2",
-	"EXT",
+	"CH1", "CH2", "EXT",
 	/* TODO: forced */
 };
 
 static const char *trigger_slopes[] = {
-	"r",
-	"f",
+	"r", "f",
 };
 
 static const char *coupling[] = {
-	"AC",
-	"DC",
-	"GND",
+	"AC", "DC", "GND",
 };
 
 static struct sr_dev_inst *dso_dev_new(const struct dso_profile *prof)
@@ -397,8 +392,8 @@ static int dev_close(struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
-		const struct sr_channel_group *cg)
+static int config_get(uint32_t key, GVariant **data,
+	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
 	struct dev_context *devc;
 	struct sr_usb_dev_inst *usb;
@@ -477,8 +472,8 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 	return SR_OK;
 }
 
-static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
-		const struct sr_channel_group *cg)
+static int config_set(uint32_t key, GVariant *data,
+	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
 	struct dev_context *devc;
 	double tmp_double;
@@ -591,57 +586,30 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 	return SR_OK;
 }
 
-static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
-		const struct sr_channel_group *cg)
+static int config_list(uint32_t key, GVariant **data,
+	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
 	struct dev_context *devc;
-	GVariant *tuple, *rational[2];
-	GVariantBuilder gvb;
-	unsigned int i;
-
-	if (key == SR_CONF_SCAN_OPTIONS) {
-		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-				scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
-		return SR_OK;
-	} else if (key == SR_CONF_DEVICE_OPTIONS && !sdi) {
-		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-				drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t));
-		return SR_OK;
-	}
-
-	if (!sdi)
-		return SR_ERR_ARG;
 
 	if (!cg) {
 		switch (key) {
+		case SR_CONF_SCAN_OPTIONS:
 		case SR_CONF_DEVICE_OPTIONS:
-			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-					devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
-			break;
+			return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
 		case SR_CONF_BUFFERSIZE:
 			if (!sdi)
 				return SR_ERR_ARG;
 			devc = sdi->priv;
-			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT64,
-					devc->profile->buffersizes, NUM_BUFFER_SIZES, sizeof(uint64_t));
+			*data = std_gvar_array_u64(devc->profile->buffersizes, NUM_BUFFER_SIZES);
 			break;
 		case SR_CONF_TIMEBASE:
-			g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
-			for (i = 0; i < ARRAY_SIZE(timebases); i++) {
-				rational[0] = g_variant_new_uint64(timebases[i][0]);
-				rational[1] = g_variant_new_uint64(timebases[i][1]);
-				tuple = g_variant_new_tuple(rational, 2);
-				g_variant_builder_add_value(&gvb, tuple);
-			}
-			*data = g_variant_builder_end(&gvb);
+			*data = std_gvar_tuple_array(ARRAY_AND_SIZE(timebases));
 			break;
 		case SR_CONF_TRIGGER_SOURCE:
-			*data = g_variant_new_strv(trigger_sources,
-					ARRAY_SIZE(trigger_sources));
+			*data = g_variant_new_strv(ARRAY_AND_SIZE(trigger_sources));
 			break;
 		case SR_CONF_TRIGGER_SLOPE:
-			*data = g_variant_new_strv(trigger_slopes,
-					ARRAY_SIZE(trigger_slopes));
+			*data = g_variant_new_strv(ARRAY_AND_SIZE(trigger_slopes));
 			break;
 		default:
 			return SR_ERR_NA;
@@ -649,21 +617,13 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 	} else {
 		switch (key) {
 		case SR_CONF_DEVICE_OPTIONS:
-			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-					devopts_cg, ARRAY_SIZE(devopts_cg), sizeof(uint32_t));
+			*data = std_gvar_array_u32(ARRAY_AND_SIZE(devopts_cg));
 			break;
 		case SR_CONF_COUPLING:
-			*data = g_variant_new_strv(coupling, ARRAY_SIZE(coupling));
+			*data = g_variant_new_strv(ARRAY_AND_SIZE(coupling));
 			break;
 		case SR_CONF_VDIV:
-			g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
-			for (i = 0; i < ARRAY_SIZE(vdivs); i++) {
-				rational[0] = g_variant_new_uint64(vdivs[i][0]);
-				rational[1] = g_variant_new_uint64(vdivs[i][1]);
-				tuple = g_variant_new_tuple(rational, 2);
-				g_variant_builder_add_value(&gvb, tuple);
-			}
-			*data = g_variant_builder_end(&gvb);
+			*data = std_gvar_tuple_array(ARRAY_AND_SIZE(vdivs));
 			break;
 		default:
 			return SR_ERR_NA;