X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=show.c;h=8b6ee7739f7461c80d9b7f6f2b956687b35d4f5a;hp=bece7e641b957ea94bd2bb4ad9d1a538780660ad;hb=902e368ed1dd50b87dd8a93dcae8ca2983f69cc3;hpb=6b27bde46ccb02784a327b51b3e7beeb2f9c681a diff --git a/show.c b/show.c index bece7e6..8b6ee77 100644 --- a/show.c +++ b/show.c @@ -21,21 +21,16 @@ #include #include -extern gint opt_loglevel; -extern gchar *opt_pds; - 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) @@ -57,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; @@ -90,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); @@ -102,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); @@ -227,6 +224,7 @@ void show_dev_detail(void) } sdi = devices->data; + g_slist_free(devices); print_dev_line(sdi); if (sr_dev_open(sdi) != SR_OK) { @@ -316,8 +314,12 @@ void show_dev_detail(void) case SR_TRIGGER_UNDER: c = 'u'; break; + default: + c = 0; + break; } - printf("%c ", c); + if (c) + printf("%c ", c); } printf("\n"); g_variant_unref(gvar_list); @@ -542,19 +544,19 @@ void show_dev_detail(void) g_variant_unref(gvar_opts); sr_dev_close(sdi); - g_slist_free(devices); } #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++) { @@ -582,8 +584,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 { @@ -637,3 +644,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); +} +