X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhantek-6xxx%2Fapi.c;h=c5bb94eb9958a9a278353f13be543164c8dd2cf0;hb=95c1fe62f77d347bf173b1236c38a9043efabd2b;hp=d88f4c6847bef4316bda03a08d3fb8d6f1b69e19;hpb=e66d1892d0dd16ed166fc8f13493f95de0607362;p=libsigrok.git

diff --git a/src/hardware/hantek-6xxx/api.c b/src/hardware/hantek-6xxx/api.c
index d88f4c68..c5bb94eb 100644
--- a/src/hardware/hantek-6xxx/api.c
+++ b/src/hardware/hantek-6xxx/api.c
@@ -63,17 +63,17 @@ static const struct hantek_6xxx_profile dev_profiles[] = {
 	{
 		0x04b4, 0x6022, 0x1d50, 0x608e, 0x0001,
 		"Hantek", "6022BE", "fx2lafw-hantek-6022be.fw",
-		dc_coupling, ARRAY_SIZE(dc_coupling), FALSE,
+		ARRAY_AND_SIZE(dc_coupling), FALSE,
 	},
 	{
 		0x8102, 0x8102, 0x1d50, 0x608e, 0x0002,
 		"Sainsmart", "DDS120", "fx2lafw-sainsmart-dds120.fw",
-		acdc_coupling, ARRAY_SIZE(acdc_coupling), TRUE,
+		ARRAY_AND_SIZE(acdc_coupling), TRUE,
 	},
 	{
 		0x04b4, 0x602a, 0x1d50, 0x608e, 0x0003,
 		"Hantek", "6022BL", "fx2lafw-hantek-6022bl.fw",
-		dc_coupling, ARRAY_SIZE(dc_coupling), FALSE,
+		ARRAY_AND_SIZE(dc_coupling), FALSE,
 	},
 	ALL_ZERO
 };
@@ -322,12 +322,11 @@ 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;
-	char str[128];
 	const uint64_t *vdiv;
 	int ch_idx;
 
@@ -360,8 +359,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 				/* Device still needs to re-enumerate after firmware
 				 * upload, so we don't know its (future) address. */
 				return SR_ERR;
-			snprintf(str, 128, "%d.%d", usb->bus, usb->address);
-			*data = g_variant_new_string(str);
+			*data = g_variant_new_printf("%d.%d", usb->bus, usb->address);
 			break;
 		default:
 			return SR_ERR_NA;
@@ -388,8 +386,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;
 	uint64_t p, q;
@@ -455,13 +453,9 @@ 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)
 {
-	GVariant *tuple, *rational[2];
-	GVariantBuilder gvb;
-	unsigned int i;
-	GVariant *gvar;
 	struct dev_context *devc;
 
 	devc = (sdi) ? sdi->priv : NULL;
@@ -472,12 +466,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}", "samplerates", gvar);
-			*data = g_variant_builder_end(&gvb);
+			*data = std_gvar_samplerates(ARRAY_AND_SIZE(samplerates));
 			break;
 		default:
 			return SR_ERR_NA;
@@ -485,21 +474,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(devc->coupling_vals, devc->coupling_tab_size);
 			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;