From: Bert Vermeulen <redacted>
Date: Sun, 7 Apr 2013 19:51:26 +0000 (+0200)
Subject: rigol-ds1xx2: SR_CONF_TIMEBASE and _VDIVS lists are now an array of tuples
X-Git-Tag: dsupstream~179
X-Git-Url: http://sigrok.org/gitweb/?a=commitdiff_plain;h=861c447bfb020a59ac9d197c4a74a4e8ea3998bf;p=libsigrok.git

rigol-ds1xx2: SR_CONF_TIMEBASE and _VDIVS lists are now an array of tuples
---

diff --git a/hardware/rigol-ds1xx2/api.c b/hardware/rigol-ds1xx2/api.c
index 572df782..61b3dbe1 100644
--- a/hardware/rigol-ds1xx2/api.c
+++ b/hardware/rigol-ds1xx2/api.c
@@ -405,6 +405,9 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
 
 static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
 {
+	GVariant *tuple, *rational[2];
+	GVariantBuilder gvb;
+	unsigned int i;
 
 	(void)sdi;
 
@@ -417,12 +420,24 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
 		*data = g_variant_new_strv(coupling, ARRAY_SIZE(coupling));
 		break;
 	case SR_CONF_VDIV:
-		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT64,
-				vdivs, ARRAY_SIZE(vdivs) * 2, sizeof(uint64_t));
+		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);
 		break;
 	case SR_CONF_TIMEBASE:
-		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT64,
-				timebases, ARRAY_SIZE(timebases) * 2, sizeof(uint64_t));
+		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);
 		break;
 	case SR_CONF_TRIGGER_SOURCE:
 		*data = g_variant_new_strv(trigger_sources,