Support SR_T_MQLIST.

[sigrok-cli.git] / session.c

diff --git a/session.c b/session.c
index b36072cf7e0289f29cdc5f8a585a4a04ca2a090e..6e101784606dc4d168a824be891f48413ceffb33 100644 (file)
--- a/session.c
+++ b/session.c
@@ -354,14 +354,15 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 
 int opt_to_gvar(char *key, char *value, struct sr_config *src)
 {
-       const struct sr_key_info *srci;
+       const struct sr_key_info *srci, *srmqi;
        double tmp_double, dlow, dhigh;
-       uint64_t tmp_u64, p, q, low, high;
-       GVariant *rational[2], *range[2];
+       uint64_t tmp_u64, p, q, low, high, mqflags;
+       uint32_t mq;
+       GVariant *rational[2], *range[2], *gvar, *gtup[2];
        GVariantBuilder *vbl;
        gboolean tmp_bool;
        gchar **keyval;
-       int ret;
+       int ret, i;
 
        if (!(srci = sr_key_info_name_get(SR_KEY_CONFIG, key))) {
                g_critical("Unknown device option '%s'.", (char *) key);
@@ -452,6 +453,36 @@ int opt_to_gvar(char *key, char *value, struct sr_config *src)
                        g_strfreev(keyval);
                }
                break;
+       case SR_T_MQLIST:
+               /*
+                 Argument is MQ id e.g. ("voltage") optionally followed by one
+                 or more /<mqflag> e.g. "/ac".
+                */
+               keyval = g_strsplit(value, "/", 0);
+               if (!keyval[0] || !(srmqi = sr_key_info_name_get(SR_KEY_MQ, keyval[0]))) {
+                       g_strfreev(keyval);
+                       ret = -1;
+                       break;
+               }
+               mq = srmqi->key;
+               mqflags = 0;
+               for (i = 1; keyval[i]; i++) {
+                       if (!(srmqi = sr_key_info_name_get(SR_KEY_MQFLAGS, keyval[i]))) {
+                               ret = -1;
+                               break;
+                       }
+                       mqflags |= srmqi->key;
+               }
+               g_strfreev(keyval);
+               if (ret != -1) {
+                       vbl = g_variant_builder_new(G_VARIANT_TYPE_ARRAY);
+                       gtup[0] = g_variant_new_uint32(mq);
+                       gtup[1] = g_variant_new_uint64(mqflags);
+                       gvar = g_variant_new_tuple(gtup, 2);
+                       g_variant_builder_add_value(vbl, gvar);
+                       src->data = g_variant_builder_end(vbl);
+               }
+               break;
        default:
                g_critical("Unknown data type specified for option '%s' "
                           "(driver implementation bug?).", key);