Add SR_T_MQLIST.

This type consists of an array, with each item a two-member tuple,
representing an MQ/MQflags pair: the first item is the MQ (type
G_VARIANT_TYPE_UINT32), and the second is the MQ flags value
(G_VARIANT_TYPE_UINT64).

A GVariant of type SR_T_MQLIST can thus always represent more than
one MQ/MQflag pair.

diff --git a/include/libsigrok/libsigrok.h b/include/libsigrok/libsigrok.h
index dc04132257ee8e92147372e385532927a2b4a1eb..0abf412f940194cd374316650afb1cb80533828f 100644 (file)
--- a/include/libsigrok/libsigrok.h
+++ b/include/libsigrok/libsigrok.h
@@ -149,6 +149,7 @@ enum sr_datatype {
        SR_T_UINT64_RANGE,
        SR_T_DOUBLE_RANGE,
        SR_T_INT32,
+       SR_T_MQLIST,
 };
 
 /** Value for sr_datafeed_packet.type. */

diff --git a/src/hwdriver.c b/src/hwdriver.c
index 37bab71144e6de7c0cc36ce37ade0dbd5b8f8574..7c9045477f40e3f015bdc89aacdd57ed6013ff8f 100644 (file)
--- a/src/hwdriver.c
+++ b/src/hwdriver.c
@@ -295,6 +295,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;
        default:
                return NULL;
        }