X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=show.c;h=7670d2cce155346ef5c70f86c1f5491925cc2519;hp=e3e9c825758e5f548baa1b7f77a71f9bbb14bb64;hb=c5136a5439708d2fc3a1cbe1e1bcc7ea17a6feac;hpb=b4eece7c5f666690fdbe1923cd3bdc7cf9425d98 diff --git a/show.c b/show.c index e3e9c82..7670d2c 100644 --- a/show.c +++ b/show.c @@ -23,16 +23,14 @@ static gint sort_inputs(gconstpointer a, gconstpointer b) { - const struct sr_input_format *ia = a, *ib = b; - - return strcmp(ia->id, ib->id); + return strcmp(sr_input_id_get((struct sr_input_module *)a), + sr_input_id_get((struct sr_input_module *)b)); } static gint sort_outputs(gconstpointer a, gconstpointer b) { - const struct sr_output_format *oa = a, *ob = b; - - return strcmp(oa->id, ob->id); + return strcmp(sr_output_id_get((struct sr_output_module *)a), + sr_output_id_get((struct sr_output_module *)b)); } static gint sort_drivers(gconstpointer a, gconstpointer b) @@ -54,8 +52,8 @@ static gint sort_pds(gconstpointer a, gconstpointer b) void show_version(void) { struct sr_dev_driver **drivers, *driver; - struct sr_input_format **inputs, *input; - struct sr_output_format **outputs, *output; + const struct sr_input_module **inputs, *input; + const struct sr_output_module **outputs, *output; const GSList *l; GSList *sl; int i; @@ -87,11 +85,12 @@ void show_version(void) printf("Supported input formats:\n"); inputs = sr_input_list(); for (sl = NULL, i = 0; inputs[i]; i++) - sl = g_slist_append(sl, inputs[i]); + sl = g_slist_append(sl, (gpointer)inputs[i]); sl = g_slist_sort(sl, sort_inputs); for (l = sl; l; l = l->next) { input = l->data; - printf(" %-20s %s\n", input->id, input->description); + printf(" %-20s %s\n", sr_input_id_get(input), + sr_input_description_get(input)); } printf("\n"); g_slist_free(sl); @@ -99,11 +98,12 @@ void show_version(void) printf("Supported output formats:\n"); outputs = sr_output_list(); for (sl = NULL, i = 0; outputs[i]; i++) - sl = g_slist_append(sl, outputs[i]); + sl = g_slist_append(sl, (gpointer)outputs[i]); sl = g_slist_sort(sl, sort_outputs); for (l = sl; l; l = l->next) { output = l->data; - printf(" %-20s %s\n", output->id, output->description); + printf(" %-20s %s\n", sr_output_id_get(output), + sr_output_description_get(output)); } printf("\n"); g_slist_free(sl); @@ -205,10 +205,11 @@ void show_dev_detail(void) double dlow, dhigh, dcur_low, dcur_high; const uint64_t *uint64, p, q, low, high; uint64_t cur_low, cur_high; - const int32_t *int32, *opts; + const uint32_t *opts; + const int32_t *int32; + uint32_t key; unsigned int num_devices, o, i; - char *tmp_str; - char *s, c; + char *tmp_str, *s, c; const char **stropts; if (!(devices = device_scan())) { @@ -279,11 +280,12 @@ void show_dev_detail(void) printf(":\n"); opts = g_variant_get_fixed_array(gvar_opts, &num_opts, sizeof(int32_t)); for (o = 0; o < num_opts; o++) { - if (!(srci = sr_config_info_get(opts[o]))) + key = opts[o] & SR_CONF_MASK; + if (!(srci = sr_config_info_get(key))) continue; - if (srci->key == SR_CONF_TRIGGER_MATCH) { - if (sr_config_list(sdi->driver, sdi, channel_group, srci->key, + if (key == SR_CONF_TRIGGER_MATCH) { + if (sr_config_list(sdi->driver, sdi, channel_group, key, &gvar_list) != SR_OK) { printf("\n"); continue; @@ -324,14 +326,14 @@ void show_dev_detail(void) printf("\n"); g_variant_unref(gvar_list); - } else if (srci->key == SR_CONF_LIMIT_SAMPLES) { + } else if (key == SR_CONF_LIMIT_SAMPLES) { /* 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. */ - if (sr_config_list(sdi->driver, sdi, channel_group, srci->key, + if (sr_config_list(sdi->driver, sdi, channel_group, key, &gvar) != SR_OK) { continue; } @@ -339,7 +341,7 @@ void show_dev_detail(void) g_variant_unref(gvar); printf(" Maximum number of samples: %"PRIu64"\n", high); - } else if (srci->key == SR_CONF_SAMPLERATE) { + } else if (key == SR_CONF_SAMPLERATE) { /* Supported samplerates */ printf(" %s", srci->id); if (sr_config_list(sdi->driver, sdi, channel_group, SR_CONF_SAMPLERATE, @@ -382,7 +384,7 @@ void show_dev_detail(void) } g_variant_unref(gvar_dict); - } else if (srci->key == SR_CONF_BUFFERSIZE) { + } else if (key == SR_CONF_BUFFERSIZE) { /* Supported buffer sizes */ printf(" %s", srci->id); if (sr_config_list(sdi->driver, sdi, channel_group, @@ -397,7 +399,7 @@ void show_dev_detail(void) printf(" %"PRIu64"\n", uint64[i]); g_variant_unref(gvar_list); - } else if (srci->key == SR_CONF_TIMEBASE) { + } else if (key == SR_CONF_TIMEBASE) { /* Supported time bases */ printf(" %s", srci->id); if (sr_config_list(sdi->driver, sdi, channel_group, @@ -416,7 +418,7 @@ void show_dev_detail(void) } g_variant_unref(gvar_list); - } else if (srci->key == SR_CONF_VDIV) { + } else if (key == SR_CONF_VDIV) { /* Supported volts/div values */ printf(" %s", srci->id); if (sr_config_list(sdi->driver, sdi, channel_group, @@ -437,15 +439,19 @@ void show_dev_detail(void) } else if (srci->datatype == SR_T_STRING) { printf(" %s: ", srci->id); - if (sr_config_get(sdi->driver, sdi, channel_group, srci->key, + if (sr_config_get(sdi->driver, sdi, channel_group, key, &gvar) == SR_OK) { tmp_str = g_strdup(g_variant_get_string(gvar, NULL)); g_variant_unref(gvar); } else tmp_str = NULL; - if (sr_config_list(sdi->driver, sdi, channel_group, srci->key, + if (sr_config_list(sdi->driver, sdi, channel_group, key, &gvar) != SR_OK) { + if (tmp_str) { + /* Can't list it, but we have a value to show. */ + printf("%s (current)", tmp_str); + } printf("\n"); continue; } @@ -465,13 +471,13 @@ void show_dev_detail(void) } else if (srci->datatype == SR_T_UINT64_RANGE) { printf(" %s: ", srci->id); - if (sr_config_list(sdi->driver, sdi, channel_group, srci->key, + if (sr_config_list(sdi->driver, sdi, channel_group, key, &gvar_list) != SR_OK) { printf("\n"); continue; } - if (sr_config_get(sdi->driver, sdi, NULL, srci->key, &gvar) == SR_OK) { + if (sr_config_get(sdi->driver, sdi, channel_group, key, &gvar) == SR_OK) { g_variant_get(gvar, "(tt)", &cur_low, &cur_high); g_variant_unref(gvar); } else { @@ -495,7 +501,7 @@ void show_dev_detail(void) } else if (srci->datatype == SR_T_BOOL) { printf(" %s: ", srci->id); - if (sr_config_get(sdi->driver, sdi, NULL, srci->key, + if (sr_config_get(sdi->driver, sdi, channel_group, key, &gvar) == SR_OK) { if (g_variant_get_boolean(gvar)) printf("on (current), off\n"); @@ -507,13 +513,13 @@ void show_dev_detail(void) } else if (srci->datatype == SR_T_DOUBLE_RANGE) { printf(" %s: ", srci->id); - if (sr_config_list(sdi->driver, sdi, channel_group, srci->key, + if (sr_config_list(sdi->driver, sdi, channel_group, key, &gvar_list) != SR_OK) { printf("\n"); continue; } - if (sr_config_get(sdi->driver, sdi, NULL, srci->key, &gvar) == SR_OK) { + if (sr_config_get(sdi->driver, sdi, channel_group, key, &gvar) == SR_OK) { g_variant_get(gvar, "(dd)", &dcur_low, &dcur_high); g_variant_unref(gvar); } else { @@ -535,6 +541,15 @@ void show_dev_detail(void) printf("\n"); g_variant_unref(gvar_list); + } else if (srci->datatype == SR_T_FLOAT) { + printf(" %s: ", srci->id); + if (sr_config_get(sdi->driver, sdi, channel_group, key, + &gvar) == SR_OK) { + printf("%f\n", g_variant_get_double(gvar)); + g_variant_unref(gvar); + } else + printf("on, off\n"); + } else { /* Everything else */ @@ -550,12 +565,13 @@ void show_dev_detail(void) #ifdef HAVE_SRD void show_pd_detail(void) { - GSList *l, *ll, *ol; struct srd_decoder *dec; struct srd_decoder_option *o; - char **pdtokens, **pdtok, *optsep, **ann, *val, *doc; struct srd_channel *pdch; struct srd_decoder_annotation_row *r; + GSList *l, *ll, *ol; + int idx; + char **pdtokens, **pdtok, *optsep, **ann, *val, *doc; pdtokens = g_strsplit(opt_pds, ",", -1); for (pdtok = pdtokens; *pdtok; pdtok++) { @@ -583,8 +599,13 @@ void show_pd_detail(void) for (l = dec->annotation_rows; l; l = l->next) { r = l->data; printf("- %s (%s): ", r->id, r->desc); - for (ll = r->ann_classes; ll; ll = ll->next) - printf("%d ", GPOINTER_TO_INT(ll->data)); + for (ll = r->ann_classes; ll; ll = ll->next) { + idx = GPOINTER_TO_INT(ll->data); + ann = g_slist_nth_data(dec->annotations, idx); + printf("%s", ann[0]); + if (ll->next) + printf(", "); + } printf("\n"); } } else { @@ -638,3 +659,83 @@ void show_pd_detail(void) } #endif +void show_input(void) +{ + const struct sr_input_module *imod; + const struct sr_option **opts; + GSList *l; + int i; + char *s, **tok; + + tok = g_strsplit(opt_input_format, ":", 0); + if (!tok[0] || !(imod = sr_input_find(tok[0]))) + g_critical("Input module '%s' not found.", opt_input_format); + + printf("ID: %s\nName: %s\n", sr_input_id_get(imod), + sr_input_name_get(imod)); + printf("Description: %s\n", sr_input_description_get(imod)); + if ((opts = sr_input_options_get(imod))) { + printf("Options:\n"); + for (i = 0; opts[i]; i++) { + printf(" %s: %s", opts[i]->id, opts[i]->desc); + if (opts[i]->def) { + s = g_variant_print(opts[i]->def, FALSE); + printf(" (default %s", s); + g_free(s); + if (opts[i]->values) { + printf(", possible values "); + for (l = opts[i]->values; l; l = l->next) { + s = g_variant_print((GVariant *)l->data, FALSE); + printf("%s%s", s, l->next ? ", " : ""); + g_free(s); + } + } + printf(")"); + } + printf("\n"); + } + sr_input_options_free(opts); + } + g_strfreev(tok); +} + +void show_output(void) +{ + const struct sr_output_module *omod; + const struct sr_option **opts; + GSList *l; + int i; + char *s, **tok; + + tok = g_strsplit(opt_output_format, ":", 0); + if (!tok[0] || !(omod = sr_output_find(tok[0]))) + g_critical("Output module '%s' not found.", opt_output_format); + + printf("ID: %s\nName: %s\n", sr_output_id_get(omod), + sr_output_name_get(omod)); + printf("Description: %s\n", sr_output_description_get(omod)); + if ((opts = sr_output_options_get(omod))) { + printf("Options:\n"); + for (i = 0; opts[i]; i++) { + printf(" %s: %s", opts[i]->id, opts[i]->desc); + if (opts[i]->def) { + s = g_variant_print(opts[i]->def, FALSE); + printf(" (default %s", s); + g_free(s); + if (opts[i]->values) { + printf(", possible values "); + for (l = opts[i]->values; l; l = l->next) { + s = g_variant_print((GVariant *)l->data, FALSE); + printf("%s%s", s, l->next ? ", " : ""); + g_free(s); + } + } + printf(")"); + } + printf("\n"); + } + sr_output_options_free(opts); + } + g_strfreev(tok); +} +