From: Bert Vermeulen <redacted>
Date: Sat, 29 Aug 2015 20:20:29 +0000 (+0200)
Subject: Change SR_T_MQLIST to SR_T_MQ.
X-Git-Tag: libsigrok-0.4.0~366
X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=75772c721d45d3b33618388e41d2d874c4f88302

Change SR_T_MQLIST to SR_T_MQ.

The need to make this a list no longer applies.

SR_T_MQ is thus a type consisting of a tuple with two elements: the first
item is the MQ (type G_VARIANT_TYPE_UINT32), and the second is the MQ
flags value (G_VARIANT_TYPE_UINT64).
---

diff --git a/include/libsigrok/libsigrok.h b/include/libsigrok/libsigrok.h
index 19acee97..63e60fba 100644
--- a/include/libsigrok/libsigrok.h
+++ b/include/libsigrok/libsigrok.h
@@ -146,7 +146,7 @@ enum sr_datatype {
 	SR_T_UINT64_RANGE,
 	SR_T_DOUBLE_RANGE,
 	SR_T_INT32,
-	SR_T_MQLIST,
+	SR_T_MQ,
 
 	/* Update sr_variant_type_get() (hwdriver.c) upon changes! */
 };
diff --git a/src/hwdriver.c b/src/hwdriver.c
index 811c7292..595ea657 100644
--- a/src/hwdriver.c
+++ b/src/hwdriver.c
@@ -302,8 +302,8 @@ SR_PRIV const GVariantType *sr_variant_type_get(int datatype)
 		return G_VARIANT_TYPE_TUPLE;
 	case SR_T_KEYVALUE:
 		return G_VARIANT_TYPE_DICTIONARY;
-	case SR_T_MQLIST:
-		return G_VARIANT_TYPE_ARRAY;
+	case SR_T_MQ:
+		return G_VARIANT_TYPE_TUPLE;
 	default:
 		return NULL;
 	}