Support SR_T_MQ.

[sigrok-cli.git] / show.c

diff --git a/show.c b/show.c
index aec61f142d7aff4a90a38e32a4b80ad56fb45f2d..b786016afdb4ab01c417d78b106cbaaa9d4dec4b 100644 (file)
--- a/show.c
+++ b/show.c
@@ -223,7 +223,7 @@ void show_dev_list(void)
 
 void show_drv_detail(struct sr_dev_driver *driver)
 {
-       const struct sr_config_info *srci;
+       const struct sr_key_info *srci;
        GVariant *gvar_opts;
        const uint32_t *opts;
        gsize num_elements, i;
@@ -235,7 +235,7 @@ void show_drv_detail(struct sr_dev_driver *driver)
                if (num_elements) {
                        printf("Driver functions:\n");
                        for (i = 0; i < num_elements; i++) {
-                               if (!(srci = sr_config_info_get(opts[i] & SR_CONF_MASK)))
+                               if (!(srci = sr_key_info_get(SR_KEY_CONFIG, opts[i] & SR_CONF_MASK)))
                                        continue;
                                printf("    %s\n", srci->name);
                        }
@@ -250,7 +250,7 @@ void show_drv_detail(struct sr_dev_driver *driver)
                if (num_elements) {
                        printf("Scan options:\n");
                        for (i = 0; i < num_elements; i++) {
-                               if (!(srci = sr_config_info_get(opts[i] & SR_CONF_MASK)))
+                               if (!(srci = sr_key_info_get(SR_KEY_CONFIG, opts[i] & SR_CONF_MASK)))
                                        continue;
                                printf("    %s\n", srci->id);
                        }
@@ -263,7 +263,7 @@ void show_dev_detail(void)
 {
        struct sr_dev_driver *driver_from_opt, *driver;
        struct sr_dev_inst *sdi;
-       const struct sr_config_info *srci;
+       const struct sr_key_info *srci, *srmqi, *srmqfi;
        struct sr_channel *ch;
        struct sr_channel_group *channel_group, *cg;
        GSList *devices, *cgl, *chl, *channel_groups;
@@ -271,11 +271,12 @@ void show_dev_detail(void)
        gsize num_opts, num_elements;
        double dlow, dhigh, dcur_low, dcur_high;
        const uint64_t *uint64, p, q, low, high;
-       uint64_t tmp_uint64, cur_low, cur_high, cur_p, cur_q;
+       uint64_t tmp_uint64, mask, cur_low, cur_high, cur_p, cur_q;
        const uint32_t *opts;
        const int32_t *int32;
-       uint32_t key, o;
-       unsigned int num_devices, i;
+       uint32_t key, o, cur_mq, mq;
+       uint64_t cur_mqflags, mqflags;
+       unsigned int num_devices, i, j;
        char *tmp_str, *s, c;
        const char **stropts;
 
@@ -345,7 +346,7 @@ void show_dev_detail(void)
        opts = g_variant_get_fixed_array(gvar_opts, &num_opts, sizeof(uint32_t));
        for (o = 0; o < num_opts; o++) {
                key = opts[o] & SR_CONF_MASK;
-               if (!(srci = sr_config_info_get(key)))
+               if (!(srci = sr_key_info_get(SR_KEY_CONFIG, key)))
                        continue;
 
                if (key == SR_CONF_TRIGGER_MATCH) {
@@ -625,6 +626,46 @@ void show_dev_detail(void)
                        }
                        g_variant_unref(gvar_list);
 
+               } else if (srci->datatype == SR_T_MQ) {
+                       printf("    %s: ", srci->id);
+                       if (maybe_config_get(driver, sdi, channel_group, key,
+                                       &gvar) == SR_OK
+                                       && g_variant_is_of_type(gvar, G_VARIANT_TYPE_TUPLE)
+                                       && g_variant_n_children(gvar) == 2) {
+                               g_variant_get(gvar, "(ut)", &cur_mq, &cur_mqflags);
+                               g_variant_unref(gvar);
+                       } else
+                               cur_mq = cur_mqflags = 0;
+
+                       if (maybe_config_list(driver, sdi, channel_group,
+                                       key, &gvar_list) != SR_OK) {
+                               printf("\n");
+                               continue;
+                       }
+                       printf(" - supported measurements:\n");
+                       num_elements = g_variant_n_children(gvar_list);
+                       for (i = 0; i < num_elements; i++) {
+                               printf("      ");
+                               gvar = g_variant_get_child_value(gvar_list, i);
+                               g_variant_get(gvar, "(ut)", &mq, &mqflags);
+                               if ((srmqi = sr_key_info_get(SR_KEY_MQ, mq)))
+                                       printf("%s", srmqi->id);
+                               else
+                                       printf("%d", mq);
+                               for (j = 0, mask = 1; j < 32; j++, mask <<= 1) {
+                                       if (!(mqflags & mask))
+                                               continue;
+                                       if ((srmqfi = sr_key_info_get(SR_KEY_MQFLAGS, mqflags & mask)))
+                                               printf("/%s", srmqfi->id);
+                                       else
+                                               printf("/%ld", mqflags & mask);
+                               }
+                               if (mq == cur_mq && mqflags == cur_mqflags)
+                                       printf(" (current)");
+                               printf("\n");
+                       }
+                       g_variant_unref(gvar_list);
+
                } else {
 
                        /* Everything else */