X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=sigrok-cli.c;h=8cfdb8e97ee4a7e0c63464c2df3ad6e791cc93af;hp=231572c6767d5c8c71a7ebe484b600b678efbdb6;hb=1e1316b3981913263fdb8d74520fa7213230944b;hpb=8e8827f4055c22b84d507b98342c321d5bed42bc diff --git a/sigrok-cli.c b/sigrok-cli.c index 231572c..8cfdb8e 100644 --- a/sigrok-cli.c +++ b/sigrok-cli.c @@ -17,7 +17,10 @@ * along with this program. If not, see . */ +#include "config.h" +#ifdef HAVE_SRD #include /* First, so we avoid a _POSIX_C_SOURCE warning. */ +#endif #include #include #include @@ -32,7 +35,6 @@ #include #include #include "sigrok-cli.h" -#include "config.h" #define DEFAULT_OUTPUT_FORMAT "bits:width=64" @@ -43,7 +45,9 @@ static uint64_t limit_frames = 0; static struct sr_output_format *output_format = NULL; static int default_output_format = FALSE; static char *output_format_param = NULL; +#ifdef HAVE_SRD static GHashTable *pd_ann_visible = NULL; +#endif static GByteArray *savebuf; static gboolean opt_version = FALSE; @@ -57,8 +61,10 @@ static gchar *opt_dev = NULL; static gchar *opt_probes = NULL; static gchar *opt_triggers = NULL; static gchar *opt_pds = NULL; +#ifdef HAVE_SRD static gchar *opt_pd_stack = NULL; static gchar *opt_pd_annotations = NULL; +#endif static gchar *opt_input_format = NULL; static gchar *opt_output_format = NULL; static gchar *opt_show = NULL; @@ -93,12 +99,14 @@ static GOptionEntry optargs[] = { "Trigger configuration", NULL}, {"wait-trigger", 'w', 0, G_OPTION_ARG_NONE, &opt_wait_trigger, "Wait for trigger", NULL}, +#ifdef HAVE_SRD {"protocol-decoders", 'a', 0, G_OPTION_ARG_STRING, &opt_pds, "Protocol decoders to run", NULL}, {"protocol-decoder-stack", 's', 0, G_OPTION_ARG_STRING, &opt_pd_stack, "Protocol decoder stack", NULL}, {"protocol-decoder-annotations", 'A', 0, G_OPTION_ARG_STRING, &opt_pd_annotations, "Protocol decoder annotation(s) to show", NULL}, +#endif {"show", 0, 0, G_OPTION_ARG_NONE, &opt_show, "Show device detail", NULL}, {"time", 0, 0, G_OPTION_ARG_STRING, &opt_time, @@ -134,7 +142,7 @@ static GSList *hash_to_hwopt(GHashTable *hash) src = g_try_malloc(sizeof(struct sr_config)); src->key = srci->key; value = g_hash_table_lookup(hash, key); - src->value = g_strdup(value); + src->data = g_variant_new_string(value); opts = g_slist_append(opts, src); } g_list_free(keys); @@ -144,7 +152,7 @@ static GSList *hash_to_hwopt(GHashTable *hash) static void free_drvopts(struct sr_config *src) { - g_free((void *)src->value); + g_variant_unref(src->data); g_free(src); } @@ -205,19 +213,23 @@ static GSList *device_scan(void) static void show_version(void) { - const GSList *l; struct sr_dev_driver **drivers; struct sr_input_format **inputs; struct sr_output_format **outputs; - struct srd_decoder *dec; int i; +#ifdef HAVE_SRD + struct srd_decoder *dec; + const GSList *l; +#endif printf("sigrok-cli %s\n\n", VERSION); printf("Using libsigrok %s (lib version %s).\n", sr_package_version_string_get(), sr_lib_version_string_get()); +#ifdef HAVE_SRD printf("Using libsigrokdecode %s (lib version %s).\n\n", srd_package_version_string_get(), srd_lib_version_string_get()); +#endif printf("Supported hardware drivers:\n"); drivers = sr_driver_list(); @@ -238,6 +250,7 @@ static void show_version(void) printf(" %-20s %s\n", outputs[i]->id, outputs[i]->description); printf("\n"); +#ifdef HAVE_SRD if (srd_init(NULL) == SRD_OK) { printf("Supported protocol decoders:\n"); srd_decoder_load_all(); @@ -251,6 +264,7 @@ static void show_version(void) srd_exit(); } printf("\n"); +#endif } static void print_dev_line(const struct sr_dev_inst *sdi) @@ -300,13 +314,13 @@ static void show_dev_detail(void) { struct sr_dev_inst *sdi; const struct sr_config_info *srci; - const struct sr_samplerates *samplerates; - struct sr_rational *rationals; GSList *devices; - uint64_t *integers; - const int *hwopts, *hwcaps; - int cap, num_devices, *tmp_bool, i; - char *s, *title; + GVariant *gvar_opts, *gvar_dict, *gvar_list, *gvar; + gsize num_opts, num_elements; + const uint64_t *int64; + const int32_t *opts, *int32; + unsigned int num_devices, tmp_bool, o, i; + char *s; const char *charopts, **stropts; if (!(devices = device_scan())) { @@ -332,49 +346,55 @@ static void show_dev_detail(void) return; } - if (sr_config_list(sdi->driver, SR_CONF_TRIGGER_TYPE, (const void **)&charopts, - sdi) == SR_OK && charopts) { - printf("Supported triggers: "); - while (*charopts) { - printf("%c ", *charopts); - charopts++; - } - printf("\n"); - } - - if ((sr_config_list(sdi->driver, SR_CONF_SCAN_OPTIONS, (const void **)&hwopts, - NULL) == SR_OK) && hwopts) { + if ((sr_config_list(sdi->driver, SR_CONF_SCAN_OPTIONS, &gvar_opts, + NULL) == SR_OK)) { + opts = g_variant_get_fixed_array(gvar_opts, &num_elements, + sizeof(int32_t)); printf("Supported driver options:\n"); - for (i = 0; hwopts[i]; i++) { - if (!(srci = sr_config_info_get(hwopts[i]))) + for (i = 0; i < num_elements; i++) { + if (!(srci = sr_config_info_get(opts[i]))) continue; printf(" %s\n", srci->id); } + g_variant_unref(gvar_opts); } - title = "Supported device options:\n"; - if ((sr_config_list(sdi->driver, SR_CONF_DEVICE_OPTIONS, (const void **)&hwcaps, - NULL) != SR_OK) || !hwcaps) + if ((sr_config_list(sdi->driver, SR_CONF_DEVICE_OPTIONS, &gvar_opts, + sdi) != SR_OK)) /* Driver supports no device instance options. */ return; - for (cap = 0; hwcaps[cap]; cap++) { - if (!(srci = sr_config_info_get(hwcaps[cap]))) + printf("Supported device options:\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]))) continue; - if (title) { - printf("%s", title); - title = NULL; - } + if (srci->key == SR_CONF_TRIGGER_TYPE) { + if (sr_config_list(sdi->driver, srci->key, &gvar, + sdi) != SR_OK) { + printf("\n"); + continue; + } + charopts = g_variant_get_string(gvar, NULL); + printf(" Supported triggers: "); + while (*charopts) { + printf("%c ", *charopts); + charopts++; + } + printf("\n"); + g_variant_unref(gvar); - if (srci->key == SR_CONF_PATTERN_MODE) { + } else if (srci->key == SR_CONF_PATTERN_MODE) { /* Pattern generator modes */ printf(" %s", srci->id); - if (sr_config_list(sdi->driver, SR_CONF_PATTERN_MODE, - (const void **)&stropts, sdi) == SR_OK) { + if (sr_config_list(sdi->driver, srci->key, &gvar, + sdi) == SR_OK) { printf(" - supported patterns:\n"); - for (i = 0; stropts[i]; i++) + stropts = g_variant_get_strv(gvar, &num_elements); + for (i = 0; i < num_elements; i++) printf(" %s\n", stropts[i]); + g_variant_unref(gvar); } else { printf("\n"); } @@ -383,111 +403,138 @@ static void show_dev_detail(void) /* Supported samplerates */ printf(" %s", srci->id); if (sr_config_list(sdi->driver, SR_CONF_SAMPLERATE, - (const void **)&samplerates, sdi) != SR_OK) { + &gvar_dict, sdi) != SR_OK) { printf("\n"); continue; } - if (samplerates->step) { + if ((gvar_list = g_variant_lookup_value(gvar_dict, + "samplerates", G_VARIANT_TYPE("at")))) { + int64 = g_variant_get_fixed_array(gvar_list, + &num_elements, sizeof(uint64_t)); + printf(" - supported samplerates:\n"); + for (i = 0; i < num_elements; i++) + printf(" %s\n", sr_samplerate_string(int64[i])); + } if ((gvar_list = g_variant_lookup_value(gvar_dict, + "samplerate-steps", G_VARIANT_TYPE("at")))) { + int64 = g_variant_get_fixed_array(gvar_list, + &num_elements, sizeof(uint64_t)); /* low */ - if (!(s = sr_samplerate_string(samplerates->low))) + if (!(s = sr_samplerate_string(int64[0]))) continue; printf(" (%s", s); g_free(s); /* high */ - if (!(s = sr_samplerate_string(samplerates->high))) + if (!(s = sr_samplerate_string(int64[1]))) continue; printf(" - %s", s); g_free(s); /* step */ - if (!(s = sr_samplerate_string(samplerates->step))) + if (!(s = sr_samplerate_string(int64[2]))) continue; printf(" in steps of %s)\n", s); g_free(s); - } else { - printf(" - supported samplerates:\n"); - for (i = 0; samplerates->list[i]; i++) - printf(" %s\n", sr_samplerate_string(samplerates->list[i])); + g_variant_unref(gvar_list); } + g_variant_unref(gvar_dict); } else if (srci->key == SR_CONF_BUFFERSIZE) { /* Supported buffer sizes */ printf(" %s", srci->id); if (sr_config_list(sdi->driver, SR_CONF_BUFFERSIZE, - (const void **)&integers, sdi) != SR_OK) { + &gvar_list, sdi) != SR_OK) { printf("\n"); continue; } + int64 = g_variant_get_fixed_array(gvar_list, + &num_elements, sizeof(uint64_t)); printf(" - supported buffer sizes:\n"); - for (i = 0; integers[i]; i++) - printf(" %"PRIu64"\n", integers[i]); + for (i = 0; i < num_elements; i++) + printf(" %"PRIu64"\n", int64[i]); + g_variant_unref(gvar_list); } else if (srci->key == SR_CONF_TIMEBASE) { /* Supported time bases */ printf(" %s", srci->id); if (sr_config_list(sdi->driver, SR_CONF_TIMEBASE, - (const void **)&rationals, sdi) != SR_OK) { + &gvar_list, sdi) != SR_OK) { printf("\n"); continue; } printf(" - supported time bases:\n"); - for (i = 0; rationals[i].p && rationals[i].q; i++) + int32 = g_variant_get_fixed_array(gvar_list, + &num_elements, sizeof(int32_t)); + for (i = 0; i < num_elements / 2; i++) printf(" %s\n", sr_period_string( - rationals[i].p * rationals[i].q)); + int32[i * 2] * int32[i * 2 + 1])); + g_variant_unref(gvar_list); } else if (srci->key == SR_CONF_TRIGGER_SOURCE) { /* Supported trigger sources */ printf(" %s", srci->id); if (sr_config_list(sdi->driver, SR_CONF_TRIGGER_SOURCE, - (const void **)&stropts, sdi) != SR_OK) { + &gvar, sdi) != SR_OK) { printf("\n"); continue; } printf(" - supported trigger sources:\n"); - for (i = 0; stropts[i]; i++) + stropts = g_variant_get_strv(gvar, &num_elements); + for (i = 0; i < num_elements; i++) printf(" %s\n", stropts[i]); + g_variant_unref(gvar); } else if (srci->key == SR_CONF_FILTER) { /* Supported filters */ printf(" %s", srci->id); if (sr_config_list(sdi->driver, SR_CONF_FILTER, - (const void **)&stropts, sdi) != SR_OK) { + &gvar, sdi) != SR_OK) { printf("\n"); continue; } printf(" - supported filter targets:\n"); - for (i = 0; stropts[i]; i++) + stropts = g_variant_get_strv(gvar, &num_elements); + for (i = 0; i < num_elements; i++) printf(" %s\n", stropts[i]); + g_variant_unref(gvar); } else if (srci->key == SR_CONF_VDIV) { /* Supported volts/div values */ printf(" %s", srci->id); if (sr_config_list(sdi->driver, SR_CONF_VDIV, - (const void **)&rationals, sdi) != SR_OK) { + &gvar_list, sdi) != SR_OK) { printf("\n"); continue; } printf(" - supported volts/div:\n"); - for (i = 0; rationals[i].p && rationals[i].q; i++) - printf(" %s\n", sr_voltage_string( &rationals[i])); + int32 = g_variant_get_fixed_array(gvar_list, + &num_elements, sizeof(int32_t)); + for (i = 0; i < num_elements / 2; i++) + printf(" %s\n", sr_period_string( + int32[i * 2] * int32[i * 2 + 1])); + g_variant_unref(gvar_list); } else if (srci->key == SR_CONF_COUPLING) { /* Supported coupling settings */ printf(" %s", srci->id); if (sr_config_list(sdi->driver, SR_CONF_COUPLING, - (const void **)&stropts, sdi) != SR_OK) { + &gvar, sdi) != SR_OK) { printf("\n"); continue; } printf(" - supported coupling options:\n"); - for (i = 0; stropts[i]; i++) + stropts = g_variant_get_strv(gvar, &num_elements); + for (i = 0; i < num_elements; i++) printf(" %s\n", stropts[i]); + g_variant_unref(gvar); } else if (srci->key == SR_CONF_DATALOG) { + /* TODO test */ /* Turning on/off internal data logging. */ printf(" %s\t(on/off", srci->id); if (sr_config_get(sdi->driver, SR_CONF_DATALOG, - (const void **)&tmp_bool, sdi) == SR_OK) { - printf(", currently %s", *tmp_bool ? "on" : "off"); + &gvar, sdi) == SR_OK) { + tmp_bool = g_variant_get_boolean(gvar); + printf(", currently %s", tmp_bool ? "on" : "off"); + g_variant_unref(gvar); } printf(")\n"); } else { @@ -495,20 +542,26 @@ static void show_dev_detail(void) printf(" %s\n", srci->id); } } + g_variant_unref(gvar_opts); sr_session_destroy(); } +#ifdef HAVE_SRD static void show_pd_detail(void) { GSList *l; struct srd_decoder *dec; - char **pdtokens, **pdtok, **ann, *doc; + struct srd_decoder_option *o; + char **pdtokens, **pdtok, *optsep, **ann, *val, *doc; struct srd_probe *p; pdtokens = g_strsplit(opt_pds, ",", -1); for (pdtok = pdtokens; *pdtok; pdtok++) { + /* Strip options. */ + if ((optsep = strchr(*pdtok, ':'))) + *optsep = '\0'; if (!(dec = srd_decoder_get_by_id(*pdtok))) { g_critical("Protocol decoder %s not found.", *pdtok); return; @@ -525,7 +578,6 @@ static void show_pd_detail(void) } else { printf("None.\n"); } - /* TODO: Print supported decoder options. */ printf("Required probes:\n"); if (dec->probes) { for (l = dec->probes; l; l = l->next) { @@ -546,6 +598,15 @@ static void show_pd_detail(void) } else { printf("None.\n"); } + if (dec->options) { + printf("Options:\n"); + for (l = dec->options; l; l = l->next) { + o = l->data; + val = g_variant_print(o->def, FALSE); + printf("- %s: %s (default %s)\n", o->id, o->desc, val); + g_free(val); + } + } if ((doc = srd_decoder_doc_get(dec))) { printf("Documentation:\n%s\n", doc[0] == '\n' ? doc + 1 : doc); @@ -555,6 +616,7 @@ static void show_pd_detail(void) g_strfreev(pdtokens); } +#endif static GArray *get_enabled_logic_probes(const struct sr_dev_inst *sdi) { @@ -588,11 +650,12 @@ static void datafeed_in(const struct sr_dev_inst *sdi, static int unitsize = 0; static int triggered = 0; static FILE *outfile = NULL; + GSList *l; + GString *out; + GVariant *gvar; int sample_size, ret; - uint64_t *samplerate, output_len, filter_out_len; + uint64_t samplerate, output_len, filter_out_len; uint8_t *output_buf, *filter_out; - GString *out; - GSList *l; /* If the first packet to come in isn't a header, don't even try. */ if (packet->type != SR_DF_HEADER && o == NULL) @@ -638,16 +701,19 @@ static void datafeed_in(const struct sr_dev_inst *sdi, /* How many bytes we need to store the packed samples. */ unitsize = (logic_probelist->len + 7) / 8; +#ifdef HAVE_SRD if (opt_pds && logic_probelist->len) { if (sr_config_get(sdi->driver, SR_CONF_SAMPLERATE, - (const void **)&samplerate, sdi) != SR_OK) { + &gvar, sdi) != SR_OK) { g_critical("Unable to initialize protocol " "decoders: no samplerate found."); break; } - srd_session_start(logic_probelist->len, unitsize, - *samplerate); + samplerate = g_variant_get_uint64(gvar); + g_variant_unref(gvar); + srd_session_start(logic_probelist->len, unitsize, samplerate); } +#endif break; case SR_DF_META: @@ -657,8 +723,12 @@ static void datafeed_in(const struct sr_dev_inst *sdi, src = l->data; switch (src->key) { case SR_CONF_SAMPLERATE: - samplerate = (uint64_t *)src->value; - g_debug("cli: got samplerate %"PRIu64, *samplerate); + samplerate = g_variant_get_uint64(src->data); + g_debug("cli: got samplerate %"PRIu64" Hz", samplerate); + break; + case SR_CONF_SAMPLE_INTERVAL: + samplerate = g_variant_get_uint64(src->data); + g_debug("cli: got sample interval %"PRIu64" ms", samplerate); break; default: /* Unknown metadata is not an error. */ @@ -709,9 +779,11 @@ static void datafeed_in(const struct sr_dev_inst *sdi, g_byte_array_append(savebuf, filter_out, filter_out_len); } else { if (opt_pds) { +#ifdef HAVE_SRD if (srd_session_send(received_samples, (uint8_t*)filter_out, filter_out_len) != SRD_OK) sr_session_stop(); +#endif } else { output_len = 0; if (o->format->data && packet->type == o->format->df_type) @@ -833,6 +905,89 @@ static void datafeed_in(const struct sr_dev_inst *sdi, } +#ifdef HAVE_SRD +static int opts_to_gvar(struct srd_decoder *dec, GHashTable *hash, + GHashTable **options) +{ + struct srd_decoder_option *o; + GSList *optl; + GVariant *gvar; + gint64 val_int; + int ret; + char *val_str, *conv; + + ret = TRUE; + *options = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, + (GDestroyNotify)g_variant_unref); + + for (optl = dec->options; optl; optl = optl->next) { + o = optl->data; + if (!(val_str = g_hash_table_lookup(hash, o->id))) + /* Not specified. */ + continue; + if (g_variant_is_of_type(o->def, G_VARIANT_TYPE_STRING)) { + gvar = g_variant_new_string(val_str); + } else if (g_variant_is_of_type(o->def, G_VARIANT_TYPE_INT64)) { + val_int = strtoll(val_str, &conv, 10); + if (!conv || conv == val_str) { + g_critical("Protocol decoder '%s' option '%s' " + "requires a number.", dec->name, o->id); + ret = FALSE; + break; + } + gvar = g_variant_new_int64(val_int); + } else { + g_critical("Unsupported type for option '%s' (%s)", + o->id, g_variant_get_type_string(o->def)); + ret = FALSE; + break; + } + g_variant_ref_sink(gvar); + g_hash_table_insert(*options, g_strdup(o->id), gvar); + g_hash_table_remove(hash, o->id); + } + + return ret; +} + +static int probes_to_gvar(struct srd_decoder *dec, GHashTable *hash, + GHashTable **probes) +{ + struct srd_probe *p; + GSList *all_probes, *l; + GVariant *gvar; + gint32 val_int; + int ret; + char *val_str, *conv; + + ret = TRUE; + *probes = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, + (GDestroyNotify)g_variant_unref); + + all_probes = g_slist_copy(dec->probes); + all_probes = g_slist_concat(all_probes, dec->opt_probes); + for (l = all_probes; l; l = l->next) { + p = l->data; + if (!(val_str = g_hash_table_lookup(hash, p->id))) + /* Not specified. */ + continue; + val_int = strtoll(val_str, &conv, 10); + if (!conv || conv == val_str) { + g_critical("Protocol decoder '%s' probes '%s' " + "is not a number.", dec->name, p->id); + ret = FALSE; + break; + } + gvar = g_variant_new_int32(val_int); + g_variant_ref_sink(gvar); + g_hash_table_insert(*probes, g_strdup(p->id), gvar); + g_hash_table_remove(hash, p->id); + } + g_slist_free(all_probes); + + return ret; +} + /* Register the given PDs for this session. * Accepts a string of the form: "spi:sck=3:sdata=4,spi:sck=3:sdata=5" * That will instantiate two SPI decoders on the clock but different data @@ -840,7 +995,9 @@ static void datafeed_in(const struct sr_dev_inst *sdi, */ static int register_pds(struct sr_dev *dev, const char *pdstring) { - GHashTable *pd_opthash; + struct srd_decoder *dec; + GHashTable *pd_opthash, *options, *probes; + GList *leftover, *l; struct srd_decoder_inst *di; int ret; char **pdtokens, **pdtok, *pd_name; @@ -851,12 +1008,12 @@ static int register_pds(struct sr_dev *dev, const char *pdstring) pd_ann_visible = g_hash_table_new_full(g_str_hash, g_int_equal, g_free, NULL); pd_name = NULL; - pd_opthash = NULL; + pd_opthash = options = probes = NULL; pdtokens = g_strsplit(pdstring, ",", 0); for (pdtok = pdtokens; *pdtok; pdtok++) { if (!(pd_opthash = parse_generic_arg(*pdtok, TRUE))) { g_critical("Invalid protocol decoder option '%s'.", *pdtok); - goto err_out; + break; } pd_name = g_strdup(g_hash_table_lookup(pd_opthash, "sigrok_key")); @@ -864,12 +1021,31 @@ static int register_pds(struct sr_dev *dev, const char *pdstring) if (srd_decoder_load(pd_name) != SRD_OK) { g_critical("Failed to load protocol decoder %s.", pd_name); ret = 1; - goto err_out; + break; + } + dec = srd_decoder_get_by_id(pd_name); + + /* Convert decoder option and probe values to GVariant. */ + if (!opts_to_gvar(dec, pd_opthash, &options)) { + ret = 1; + break; + } + if (!probes_to_gvar(dec, pd_opthash, &probes)) { + ret = 1; + break; + } + if (g_hash_table_size(pd_opthash) > 0) { + leftover = g_hash_table_get_keys(pd_opthash); + for (l = leftover; l; l = l->next) + g_critical("Unknown option or probe '%s'", (char *)l->data); + g_list_free(leftover); + break; } - if (!(di = srd_inst_new(pd_name, pd_opthash))) { + + if (!(di = srd_inst_new(pd_name, options))) { g_critical("Failed to instantiate protocol decoder %s.", pd_name); ret = 1; - goto err_out; + break; } /* If no annotation list was specified, add them all in now. @@ -880,22 +1056,20 @@ static int register_pds(struct sr_dev *dev, const char *pdstring) g_hash_table_insert(pd_ann_visible, g_strdup(di->inst_id), NULL); - /* Any keys left in the options hash are probes, where the key - * is the probe name as specified in the decoder class, and the - * value is the probe number i.e. the order in which the PD's - * incoming samples are arranged. */ - if (srd_inst_probe_set_all(di, pd_opthash) != SRD_OK) { + /* Remap the probes if needed. */ + if (srd_inst_probe_set_all(di, probes) != SRD_OK) { ret = 1; - goto err_out; + break; } - g_hash_table_destroy(pd_opthash); - pd_opthash = NULL; } -err_out: g_strfreev(pdtokens); if (pd_opthash) g_hash_table_destroy(pd_opthash); + if (options) + g_hash_table_destroy(options); + if (probes) + g_hash_table_destroy(probes); if (pd_name) g_free(pd_name); @@ -1005,6 +1179,38 @@ int setup_pd_annotations(void) return 0; } +void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data) +{ + int i; + char **annotations; + gpointer ann_format; + + /* 'cb_data' is not used in this specific callback. */ + (void)cb_data; + + if (!pd_ann_visible) + return; + + if (!g_hash_table_lookup_extended(pd_ann_visible, pdata->pdo->di->inst_id, + NULL, &ann_format)) + /* Not in the list of PDs whose annotations we're showing. */ + return; + + if (pdata->ann_format != GPOINTER_TO_INT(ann_format)) + /* We don't want this particular format from the PD. */ + return; + + annotations = pdata->data; + if (opt_loglevel > SR_LOG_WARN) + printf("%"PRIu64"-%"PRIu64" ", pdata->start_sample, pdata->end_sample); + printf("%s: ", pdata->pdo->proto_id); + for (i = 0; annotations[i]; i++) + printf("\"%s\" ", annotations[i]); + printf("\n"); + fflush(stdout); +} +#endif + int setup_output_format(void) { GHashTable *fmtargs; @@ -1052,37 +1258,6 @@ int setup_output_format(void) return 0; } -void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data) -{ - int i; - char **annotations; - gpointer ann_format; - - /* 'cb_data' is not used in this specific callback. */ - (void)cb_data; - - if (!pd_ann_visible) - return; - - if (!g_hash_table_lookup_extended(pd_ann_visible, pdata->pdo->di->inst_id, - NULL, &ann_format)) - /* Not in the list of PDs whose annotations we're showing. */ - return; - - if (pdata->ann_format != GPOINTER_TO_INT(ann_format)) - /* We don't want this particular format from the PD. */ - return; - - annotations = pdata->data; - if (opt_loglevel > SR_LOG_WARN) - printf("%"PRIu64"-%"PRIu64" ", pdata->start_sample, pdata->end_sample); - printf("%s: ", pdata->pdo->proto_id); - for (i = 0; annotations[i]; i++) - printf("\"%s\" ", annotations[i]); - printf("\n"); - fflush(stdout); -} - static int select_probes(struct sr_dev_inst *sdi) { struct sr_probe *probe; @@ -1348,45 +1523,39 @@ static void set_options(void) static int set_limit_time(const struct sr_dev_inst *sdi) { + GVariant *gvar; uint64_t time_msec; - uint64_t *samplerate; + uint64_t samplerate; - time_msec = sr_parse_timestring(opt_time); - if (time_msec == 0) { + if (!(time_msec = sr_parse_timestring(opt_time))) { g_critical("Invalid time '%s'", opt_time); - sr_session_destroy(); return SR_ERR; } if (sr_dev_has_option(sdi, SR_CONF_LIMIT_MSEC)) { - if (sr_config_set(sdi, SR_CONF_LIMIT_MSEC, &time_msec) != SR_OK) { + gvar = g_variant_new_uint64(time_msec); + if (sr_config_set(sdi, SR_CONF_LIMIT_MSEC, gvar) != SR_OK) { g_critical("Failed to configure time limit."); - sr_session_destroy(); return SR_ERR; } - } - else { - /* time limit set, but device doesn't support this... - * convert to samples based on the samplerate. - */ - limit_samples = 0; - if (sr_dev_has_option(sdi, SR_CONF_SAMPLERATE)) { - sr_config_get(sdi->driver, SR_CONF_SAMPLERATE, - (const void **)&samplerate, sdi); - limit_samples = (*samplerate) * time_msec / (uint64_t)1000; - } + } else if (sr_dev_has_option(sdi, SR_CONF_SAMPLERATE)) { + /* Convert to samples based on the samplerate. */ + sr_config_get(sdi->driver, SR_CONF_SAMPLERATE, &gvar, sdi); + samplerate = g_variant_get_uint64(gvar); + g_variant_unref(gvar); + limit_samples = (samplerate) * time_msec / (uint64_t)1000; if (limit_samples == 0) { g_critical("Not enough time at this samplerate."); - sr_session_destroy(); return SR_ERR; } - - if (sr_config_set(sdi, SR_CONF_LIMIT_SAMPLES, - &limit_samples) != SR_OK) { + gvar = g_variant_new_uint64(limit_samples); + if (sr_config_set(sdi, SR_CONF_LIMIT_SAMPLES, gvar) != SR_OK) { g_critical("Failed to configure time-based sample limit."); - sr_session_destroy(); return SR_ERR; } + } else { + g_critical("This device does not support time limits."); + return SR_ERR; } return SR_OK; @@ -1396,6 +1565,7 @@ static void run_session(void) { GSList *devices; GHashTable *devargs; + GVariant *gvar; struct sr_dev_inst *sdi; int max_probes, i; char **triggerlist; @@ -1465,9 +1635,13 @@ static void run_session(void) } if (opt_samples) { - if ((sr_parse_sizestring(opt_samples, &limit_samples) != SR_OK) - || (sr_config_set(sdi, SR_CONF_LIMIT_SAMPLES, - &limit_samples) != SR_OK)) { + if ((sr_parse_sizestring(opt_samples, &limit_samples) != SR_OK)) { + g_critical("Invalid sample limit '%s'.", opt_samples); + sr_session_destroy(); + return; + } + gvar = g_variant_new_uint64(limit_samples); + if (sr_config_set(sdi, SR_CONF_LIMIT_SAMPLES, gvar) != SR_OK) { g_critical("Failed to configure sample limit."); sr_session_destroy(); return; @@ -1475,9 +1649,12 @@ static void run_session(void) } if (opt_frames) { - if ((sr_parse_sizestring(opt_frames, &limit_frames) != SR_OK) - || (sr_config_set(sdi, SR_CONF_LIMIT_FRAMES, - &limit_frames) != SR_OK)) { + if ((sr_parse_sizestring(opt_frames, &limit_frames) != SR_OK)) { + g_critical("Invalid sample limit '%s'.", opt_samples); + sr_session_destroy(); + return; + } + if (sr_config_set(sdi, SR_CONF_LIMIT_FRAMES, gvar) != SR_OK) { g_critical("Failed to configure frame limit."); sr_session_destroy(); return; @@ -1541,11 +1718,12 @@ int main(int argc, char **argv) if (sr_log_loglevel_set(opt_loglevel) != SR_OK) goto done; - /* Set the loglevel (amount of messages to output) for libsigrokdecode. */ - if (srd_log_loglevel_set(opt_loglevel) != SRD_OK) + if (sr_init(&sr_ctx) != SR_OK) goto done; - if (sr_init(&sr_ctx) != SR_OK) +#ifdef HAVE_SRD + /* Set the loglevel (amount of messages to output) for libsigrokdecode. */ + if (srd_log_loglevel_set(opt_loglevel) != SRD_OK) goto done; if (opt_pds) { @@ -1561,6 +1739,7 @@ int main(int argc, char **argv) if (setup_pd_annotations() != 0) goto done; } +#endif if (setup_output_format() != 0) goto done; @@ -1569,8 +1748,10 @@ int main(int argc, char **argv) show_version(); else if (opt_list_devs) show_dev_list(); +#ifdef HAVE_SRD else if (opt_pds && opt_show) show_pd_detail(); +#endif else if (opt_show) show_dev_detail(); else if (opt_input_file) @@ -1582,8 +1763,10 @@ int main(int argc, char **argv) else printf("%s", g_option_context_get_help(context, TRUE, NULL)); +#ifdef HAVE_SRD if (opt_pds) srd_exit(); +#endif ret = 0;