X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=show.c;h=4cdf7049da05e51809ba1f4277560fac5b33b55d;hp=b8560be30e2d7970a9a987f96ed871a2ab0f28cc;hb=b0f1c54057614508b8702ea2565ec4758019030d;hpb=ca50f4b3d69016014c8ab9d7765da68fdb8d796f diff --git a/show.c b/show.c index b8560be..4cdf704 100644 --- a/show.c +++ b/show.c @@ -18,7 +18,6 @@ */ #include "sigrok-cli.h" -#include "config.h" #include #include @@ -46,12 +45,14 @@ static gint sort_drivers(gconstpointer a, gconstpointer b) return strcmp(sdda->name, sddb->name); } +#ifdef HAVE_SRD static gint sort_pds(gconstpointer a, gconstpointer b) { const struct srd_decoder *sda = a, *sdb = b; return strcmp(sda->id, sdb->id); } +#endif void show_version(void) { @@ -130,16 +131,16 @@ void show_version(void) #endif } -static gint sort_probes(gconstpointer a, gconstpointer b) +static gint sort_channels(gconstpointer a, gconstpointer b) { - const struct sr_probe *pa = a, *pb = b; + const struct sr_channel *pa = a, *pb = b; return pa->index - pb->index; } static void print_dev_line(const struct sr_dev_inst *sdi) { - struct sr_probe *probe; + struct sr_channel *ch; GSList *sl, *l; GString *s; GVariant *gvar; @@ -158,16 +159,16 @@ static void print_dev_line(const struct sr_dev_inst *sdi) g_string_append_printf(s, "%s ", sdi->model); if (sdi->version && sdi->version[0]) g_string_append_printf(s, "%s ", sdi->version); - if (sdi->probes) { - if (g_slist_length(sdi->probes) == 1) { - probe = sdi->probes->data; - g_string_append_printf(s, "with 1 probe: %s", probe->name); + if (sdi->channels) { + if (g_slist_length(sdi->channels) == 1) { + ch = sdi->channels->data; + g_string_append_printf(s, "with 1 channel: %s", ch->name); } else { - sl = g_slist_sort(g_slist_copy(sdi->probes), sort_probes); - g_string_append_printf(s, "with %d probes:", g_slist_length(sl)); + sl = g_slist_sort(g_slist_copy(sdi->channels), sort_channels); + g_string_append_printf(s, "with %d channels:", g_slist_length(sl)); for (l = sl; l; l = l->next) { - probe = l->data; - g_string_append_printf(s, " %s", probe->name); + ch = l->data; + g_string_append_printf(s, " %s", ch->name); } g_slist_free(sl); } @@ -199,19 +200,19 @@ void show_dev_detail(void) { struct sr_dev_inst *sdi; const struct sr_config_info *srci; - struct sr_probe *probe; + struct sr_channel *ch; struct sr_channel_group *channel_group, *cg; - GSList *devices, *cgl, *prl; + GSList *devices, *cgl, *chl; GVariant *gvar_opts, *gvar_dict, *gvar_list, *gvar; gsize num_opts, num_elements; double dlow, dhigh, dcur_low, dcur_high; const uint64_t *uint64, p, q, low, high; uint64_t cur_low, cur_high; - const int32_t *opts; + const int32_t *int32, *opts; unsigned int num_devices, o, i; char *tmp_str; - char *s; - const char *charopts, **stropts; + char *s, c; + const char **stropts; if (!(devices = device_scan())) { g_critical("No devices found."); @@ -248,7 +249,7 @@ void show_dev_detail(void) /* Selected channels and channel group may affect which options are * returned, or which values for them. */ - select_probes(sdi); + select_channels(sdi); channel_group = select_channel_group(sdi); if ((sr_config_list(sdi->driver, sdi, channel_group, SR_CONF_DEVICE_OPTIONS, @@ -262,9 +263,9 @@ void show_dev_detail(void) cg = cgl->data; printf(" %s: channel%s", cg->name, g_slist_length(cg->channels) > 1 ? "s" : ""); - for (prl = cg->channels; prl; prl = prl->next) { - probe = prl->data; - printf(" %s", probe->name); + for (chl = cg->channels; chl; chl = chl->next) { + ch = chl->data; + printf(" %s", ch->name); } printf("\n"); } @@ -283,20 +284,47 @@ void show_dev_detail(void) if (!(srci = sr_config_info_get(opts[o]))) continue; - if (srci->key == SR_CONF_TRIGGER_TYPE) { + if (srci->key == SR_CONF_TRIGGER_MATCH) { if (sr_config_list(sdi->driver, sdi, channel_group, srci->key, - &gvar) != SR_OK) { + &gvar_list) != SR_OK) { printf("\n"); continue; } - charopts = g_variant_get_string(gvar, NULL); + int32 = g_variant_get_fixed_array(gvar_list, + &num_elements, sizeof(int32_t)); printf(" Supported triggers: "); - while (*charopts) { - printf("%c ", *charopts); - charopts++; + for (i = 0; i < num_elements; i++) { + switch(int32[i]) { + case SR_TRIGGER_ZERO: + c = '0'; + break; + case SR_TRIGGER_ONE: + c = '1'; + break; + case SR_TRIGGER_RISING: + c = 'r'; + break; + case SR_TRIGGER_FALLING: + c = 'f'; + break; + case SR_TRIGGER_EDGE: + c = 'e'; + break; + case SR_TRIGGER_OVER: + c = 'o'; + break; + case SR_TRIGGER_UNDER: + c = 'u'; + break; + default: + c = 0; + break; + } + if (c) + printf("%c ", c); } printf("\n"); - g_variant_unref(gvar); + g_variant_unref(gvar_list); } else if (srci->key == SR_CONF_LIMIT_SAMPLES) { /* If implemented in config_list(), this denotes the @@ -409,7 +437,7 @@ void show_dev_detail(void) } g_variant_unref(gvar_list); - } else if (srci->datatype == SR_T_CHAR) { + } else if (srci->datatype == SR_T_STRING) { printf(" %s: ", srci->id); if (sr_config_get(sdi->driver, sdi, channel_group, srci->key, &gvar) == SR_OK) { @@ -481,7 +509,7 @@ void show_dev_detail(void) } else if (srci->datatype == SR_T_DOUBLE_RANGE) { printf(" %s: ", srci->id); - if (sr_config_list(sdi->driver, sdi, probe_group, srci->key, + if (sr_config_list(sdi->driver, sdi, channel_group, srci->key, &gvar_list) != SR_OK) { printf("\n"); continue; @@ -529,7 +557,7 @@ void show_pd_detail(void) struct srd_decoder *dec; struct srd_decoder_option *o; char **pdtokens, **pdtok, *optsep, **ann, *val, *doc; - struct srd_probe *p; + struct srd_channel *pdch; struct srd_decoder_annotation_row *r; pdtokens = g_strsplit(opt_pds, ",", -1); @@ -565,22 +593,22 @@ void show_pd_detail(void) } else { printf("None.\n"); } - printf("Required probes:\n"); - if (dec->probes) { - for (l = dec->probes; l; l = l->next) { - p = l->data; + printf("Required channels:\n"); + if (dec->channels) { + for (l = dec->channels; l; l = l->next) { + pdch = l->data; printf("- %s (%s): %s\n", - p->id, p->name, p->desc); + pdch->id, pdch->name, pdch->desc); } } else { printf("None.\n"); } - printf("Optional probes:\n"); - if (dec->opt_probes) { - for (l = dec->opt_probes; l; l = l->next) { - p = l->data; + printf("Optional channels:\n"); + if (dec->opt_channels) { + for (l = dec->opt_channels; l; l = l->next) { + pdch = l->data; printf("- %s (%s): %s\n", - p->id, p->name, p->desc); + pdch->id, pdch->name, pdch->desc); } } else { printf("None.\n");