X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhantek-6xxx%2Fapi.c;h=aed2b970ae37489acac83bad492c03221e9f2a06;hb=db944f1622479a91c257315ad368b63c5b58149c;hp=d88f4c6847bef4316bda03a08d3fb8d6f1b69e19;hpb=6b82c3e57aea481a1c9ac949a9d93078e0607292;p=libsigrok.git

diff --git a/src/hardware/hantek-6xxx/api.c b/src/hardware/hantek-6xxx/api.c
index d88f4c68..aed2b970 100644
--- a/src/hardware/hantek-6xxx/api.c
+++ b/src/hardware/hantek-6xxx/api.c
@@ -458,9 +458,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 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;
 
@@ -492,14 +490,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 			*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(&vdivs, ARRAY_SIZE(vdivs));
 			break;
 		default:
 			return SR_ERR_NA;