From ad6520c433602a426e4e55fec2d5aef8fe11a5b5 Mon Sep 17 00:00:00 2001 From: Bert Vermeulen Date: Fri, 25 Jul 2014 22:39:48 +0200 Subject: [PATCH] Use finished output API. --- doc/sigrok-cli.1 | 6 +++-- main.c | 2 ++ session.c | 59 +++++++++++++++++++++++++++++++----------------- show.c | 50 +++++++++++++++++++++++++++++++++++----- sigrok-cli.h | 1 + 5 files changed, 89 insertions(+), 29 deletions(-) diff --git a/doc/sigrok-cli.1 b/doc/sigrok-cli.1 index e7e5a95..b1592bd 100644 --- a/doc/sigrok-cli.1 +++ b/doc/sigrok-cli.1 @@ -379,10 +379,12 @@ need a serial port specified: $ .B "sigrok\-cli \-\-driver ols:conn=/dev/ttyACM0 \-\-show .sp -To view the documentation for a protocol decoder: +This also works for protocol decoders and output modules: .sp $ -.B "sigrok\-cli \-\-protocol-decoders i2c \-\-show +.B "sigrok\-cli \-\-protocol\-decoders i2c \-\-show + $ +.B "sigrok\-cli \-\-output\-format bits \-\-show .TP .B "\-\-scan" Scan for devices that can be detected automatically. diff --git a/main.c b/main.c index ea4c718..d300748 100644 --- a/main.c +++ b/main.c @@ -162,6 +162,8 @@ int main(int argc, char **argv) if (opt_version) show_version(); + else if (opt_output_format && opt_show) + show_output(); else if (opt_scan_devs) show_dev_list(); #ifdef HAVE_SRD diff --git a/session.c b/session.c index e5c7d5d..705dcc8 100644 --- a/session.c +++ b/session.c @@ -71,28 +71,38 @@ static int set_limit_time(const struct sr_dev_inst *sdi) return SR_OK; } -struct sr_output_format *find_output_module(char *name) +GHashTable *generic_arg_to_opt(const struct sr_option *opts, GHashTable *genargs) { - struct sr_output_format **outputs, *omod; - int i; - - omod = NULL; - outputs = sr_output_list(); - for (i = 0; outputs[i]; i++) { - if (!strcmp(outputs[i]->id, name)) { - omod = outputs[i]; - break; - } + GHashTable *hash; + GVariant *gvar; + const struct sr_option *opt; + char *s; + + hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, + (GDestroyNotify)g_variant_unref); + for (opt = opts; opt->id && opt->def; opt++) { + if (!(s = g_hash_table_lookup(genargs, opt->id))) + continue; + if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE_UINT32)) { + gvar = g_variant_new_uint32(strtoul(s, NULL, 10)); + g_hash_table_insert(hash, g_strdup(opt->id), + g_variant_ref_sink(gvar)); + printf("opt %s value %s\n", opt->id, s); + } else { + g_critical("Don't know how to convert option '%s' to %s!", + opt->id, g_variant_get_type_string(opt->def)); + } } - return omod; + return hash; } -struct sr_output *setup_output_format(const struct sr_dev_inst *sdi) +const struct sr_output *setup_output_format(const struct sr_dev_inst *sdi) { - struct sr_output_format *omod; - GHashTable *fmtargs; - struct sr_output *o; + const struct sr_output_module *omod; + const struct sr_option *opts; + const struct sr_output *o; + GHashTable *fmtargs, *fmtopts; char *fmtspec; if (opt_output_format && !strcmp(opt_output_format, "sigrok")) { @@ -114,10 +124,17 @@ struct sr_output *setup_output_format(const struct sr_dev_inst *sdi) fmtspec = g_hash_table_lookup(fmtargs, "sigrok_key"); if (!fmtspec) g_critical("Invalid output format."); - if (!(omod = find_output_module(fmtspec))) + if (!(omod = sr_output_find(fmtspec))) g_critical("Unknown output format '%s'.", fmtspec); g_hash_table_remove(fmtargs, "sigrok_key"); - o = sr_output_new(omod, fmtargs, sdi); + if ((opts = sr_output_options_get(omod))) { + fmtopts = generic_arg_to_opt(opts, fmtargs); + sr_output_options_free(omod); + } else + fmtopts = NULL; + o = sr_output_new(omod, fmtopts, sdi); + if (fmtopts) + g_hash_table_destroy(fmtopts); g_hash_table_destroy(fmtargs); return o; @@ -132,8 +149,8 @@ void datafeed_in(const struct sr_dev_inst *sdi, struct sr_session *session; struct sr_config *src; struct sr_channel *ch; - static struct sr_output *o = NULL; - static struct sr_output *oa = NULL; + static const struct sr_output *o = NULL; + static const struct sr_output *oa = NULL; static uint64_t rcvd_samples_logic = 0; static uint64_t rcvd_samples_analog = 0; static uint64_t samplerate = 0; @@ -158,7 +175,7 @@ void datafeed_in(const struct sr_dev_inst *sdi, o = setup_output_format(sdi); /* Set up backup analog output module. */ - oa = sr_output_new(find_output_module("analog"), NULL, sdi); + oa = sr_output_new(sr_output_find("analog"), NULL, sdi); /* Prepare non-stdout output. */ outfile = stdout; diff --git a/show.c b/show.c index e3e9c82..ba15120 100644 --- a/show.c +++ b/show.c @@ -30,9 +30,8 @@ static gint sort_inputs(gconstpointer a, gconstpointer 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) @@ -55,7 +54,7 @@ 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_output_module **outputs, *output; const GSList *l; GSList *sl; int i; @@ -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); @@ -638,3 +638,41 @@ void show_pd_detail(void) } #endif +void show_output(void) +{ + const struct sr_output_module *omod; + const struct sr_option *opt; + GSList *l; + char *s; + + if (!(omod = sr_output_find(opt_output_format))) + 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 ((opt = sr_output_options_get(omod))) { + printf("Options:\n"); + while (opt->id) { + printf(" %s: %s", opt->id, opt->desc); + if (opt->def) { + s = g_variant_print(opt->def, FALSE); + printf(" (default %s", s); + g_free(s); + if (opt->values) { + printf(", possible values "); + for (l = opt->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"); + opt++; + } + sr_output_options_free(omod); + } +} + diff --git a/sigrok-cli.h b/sigrok-cli.h index b158e00..ac946a0 100644 --- a/sigrok-cli.h +++ b/sigrok-cli.h @@ -38,6 +38,7 @@ void show_version(void); void show_dev_list(void); void show_dev_detail(void); void show_pd_detail(void); +void show_output(void); /* device.c */ GSList *device_scan(void); -- 2.30.2