X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=show.c;h=957560f333a48637ce85f2306afbf7f7b6a8a801;hp=d43c716ba52d4bde79af35b89af38d885a7c7268;hb=e950559979908f828a903ede8a50bde091566eed;hpb=15db66c6a90ea967264b66b80d381b89847e3afa diff --git a/show.c b/show.c index d43c716..957560f 100644 --- a/show.c +++ b/show.c @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -#include "sigrok-cli.h" #include #include +#include "sigrok-cli.h" static gint sort_inputs(gconstpointer a, gconstpointer b) { @@ -78,7 +78,7 @@ void show_version(void) #endif printf("Supported hardware drivers:\n"); - drivers = sr_driver_list(); + drivers = sr_driver_list(sr_ctx); for (sl = NULL, i = 0; drivers[i]; i++) sl = g_slist_append(sl, drivers[i]); sl = g_slist_sort(sl, sort_drivers); @@ -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,19 +263,20 @@ 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; - GVariant *gvar_opts, *gvar_dict, *gvar_list, *gvar; + GVariant *gvar_opts, *gvar_dict, *gvar_list, *gvar, *element; 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; @@ -308,8 +309,10 @@ void show_dev_detail(void) return; } - /* Selected channels and channel group may affect which options are - * returned, or which values for them. */ + /* + * Selected channels and channel group may affect which options are + * returned, or which values for them. + */ select_channels(sdi); channel_group = select_channel_group(sdi); @@ -343,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) { @@ -356,7 +359,7 @@ void show_dev_detail(void) &num_elements, sizeof(int32_t)); printf(" Supported triggers: "); for (i = 0; i < num_elements; i++) { - switch(int32[i]) { + switch (int32[i]) { case SR_TRIGGER_ZERO: c = '0'; break; @@ -390,12 +393,14 @@ void show_dev_detail(void) } else if (key == SR_CONF_LIMIT_SAMPLES && config_key_has_cap(driver, sdi, NULL, key, SR_CONF_LIST)) { - /* If implemented in config_list(), this denotes the + /* + * If implemented in config_list(), this denotes the * maximum number of samples a device can send. This * really applies only to logic analyzers, and then * only to those that don't support compression, or * have it turned off by default. The values returned - * are the low/high limits. */ + * are the low/high limits. + */ if (sr_config_list(driver, sdi, channel_group, key, &gvar) == SR_OK) { g_variant_get(gvar, "(tt)", &low, &high); @@ -621,6 +626,48 @@ void show_dev_detail(void) } g_variant_unref(gvar_list); + } else if (srci->datatype == SR_T_MQLIST) { + 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_ARRAY) + && g_variant_n_children(gvar) == 1) { + element = g_variant_get_child_value(gvar, 0); + g_variant_get(element, "(ut)", &cur_mq, &cur_mqflags); + g_variant_unref(element); + 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 */