X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=sigrok-cli.c;h=8521b9546128d17ff2c4f5fa5cae259d7d41d1a8;hp=d1ef2294ed3313da2b9038c8b290d41510194ae0;hb=7058a9b8924047b6c3066e80397dcb789e10c9c4;hpb=d142a3f76f10605d58f4d1dfb1d93ed8c86a0a34 diff --git a/sigrok-cli.c b/sigrok-cli.c index d1ef229..8521b95 100644 --- a/sigrok-cli.c +++ b/sigrok-cli.c @@ -1,5 +1,5 @@ /* - * This file is part of the sigrok project. + * This file is part of the sigrok-cli project. * * Copyright (C) 2012 Bert Vermeulen * @@ -19,7 +19,7 @@ #include "config.h" #ifdef HAVE_SRD -#include /* First, so we avoid a _POSIX_C_SOURCE warning. */ +#include /* First, so we avoid a _POSIX_C_SOURCE warning. */ #endif #include #include @@ -52,12 +52,12 @@ static GByteArray *savebuf; static gboolean opt_version = FALSE; static gint opt_loglevel = SR_LOG_WARN; /* Show errors+warnings per default. */ -static gboolean opt_list_devs = FALSE; +static gboolean opt_scan_devs = FALSE; static gboolean opt_wait_trigger = FALSE; static gchar *opt_input_file = NULL; static gchar *opt_output_file = NULL; static gchar *opt_drv = NULL; -static gchar *opt_dev = NULL; +static gchar *opt_config = NULL; static gchar *opt_probes = NULL; static gchar *opt_triggers = NULL; static gchar *opt_pds = NULL; @@ -78,13 +78,11 @@ static GOptionEntry optargs[] = { {"version", 'V', 0, G_OPTION_ARG_NONE, &opt_version, "Show version and support list", NULL}, {"loglevel", 'l', 0, G_OPTION_ARG_INT, &opt_loglevel, - "Set libsigrok/libsigrokdecode loglevel", NULL}, - {"list-devices", 'D', 0, G_OPTION_ARG_NONE, &opt_list_devs, - "Scan for devices", NULL}, - {"driver", 0, 0, G_OPTION_ARG_STRING, &opt_drv, - "Use only this driver", NULL}, - {"device", 'd', 0, G_OPTION_ARG_STRING, &opt_dev, - "Use specified device", NULL}, + "Set loglevel (5 is most verbose)", NULL}, + {"driver", 'd', 0, G_OPTION_ARG_STRING, &opt_drv, + "The driver to use", NULL}, + {"config", 'c', 0, G_OPTION_ARG_STRING, &opt_config, + "Specify device configuration options", NULL}, {"input-file", 'i', 0, G_OPTION_ARG_FILENAME, &opt_input_file, "Load input from file", NULL}, {"input-format", 'I', 0, G_OPTION_ARG_STRING, &opt_input_format, @@ -100,13 +98,15 @@ static GOptionEntry optargs[] = { {"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", 'P', 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", '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 + {"scan", 0, 0, G_OPTION_ARG_NONE, &opt_scan_devs, + "Scan for devices", NULL}, {"show", 0, 0, G_OPTION_ARG_NONE, &opt_show, "Show device detail", NULL}, {"time", 0, 0, G_OPTION_ARG_STRING, &opt_time, @@ -142,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); @@ -152,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); } @@ -185,10 +185,14 @@ static GSList *device_scan(void) return NULL; } drvopts = NULL; - if (g_hash_table_size(drvargs) > 0) - if (!(drvopts = hash_to_hwopt(drvargs))) + if (g_hash_table_size(drvargs) > 0) { + if (!(drvopts = hash_to_hwopt(drvargs))) { /* Unknown options, already logged. */ + g_hash_table_destroy(drvargs); return NULL; + } + } + g_hash_table_destroy(drvargs); devices = sr_driver_scan(driver, drvopts); g_slist_free_full(drvopts, (GDestroyNotify)free_drvopts); } else { @@ -248,6 +252,7 @@ static void show_version(void) outputs = sr_output_list(); for (i = 0; outputs[i]; i++) printf(" %-20s %s\n", outputs[i]->id, outputs[i]->description); + printf(" %-20s %s\n", "sigrok", "Default file output format"); printf("\n"); #ifdef HAVE_SRD @@ -271,26 +276,39 @@ static void print_dev_line(const struct sr_dev_inst *sdi) { struct sr_probe *probe; GSList *l; + GString *s; + GVariant *gvar; + s = g_string_sized_new(128); + g_string_assign(s, sdi->driver->name); + if (sr_config_get(sdi->driver, SR_CONF_CONN, &gvar, sdi) == SR_OK) { + g_string_append(s, ":conn="); + g_string_append(s, g_variant_get_string(gvar, NULL)); + g_variant_unref(gvar); + } + g_string_append(s, " - "); if (sdi->vendor && sdi->vendor[0]) - printf("%s ", sdi->vendor); + g_string_append_printf(s, "%s ", sdi->vendor); if (sdi->model && sdi->model[0]) - printf("%s ", sdi->model); + g_string_append_printf(s, "%s ", sdi->model); if (sdi->version && sdi->version[0]) - printf("%s ", sdi->version); + g_string_append_printf(s, "%s ", sdi->version); if (sdi->probes) { if (g_slist_length(sdi->probes) == 1) { probe = sdi->probes->data; - printf("with 1 probe: %s", probe->name); + g_string_append_printf(s, "with 1 probe: %s", probe->name); } else { - printf("with %d probes:", g_slist_length(sdi->probes)); + g_string_append_printf(s, "with %d probes:", g_slist_length(sdi->probes)); for (l = sdi->probes; l; l = l->next) { probe = l->data; - printf(" %s", probe->name); + g_string_append_printf(s, " %s", probe->name); } } } - printf("\n"); + g_string_append_printf(s, "\n"); + printf("%s", s->str); + g_string_free(s, TRUE); + } static void show_dev_list(void) @@ -314,13 +332,15 @@ 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 *uint64, p, q, low, high; + uint64_t cur_low, cur_high; + const int32_t *opts; + unsigned int num_devices, o, i; + char *tmp_str; + char *s; const char *charopts, **stropts; if (!(devices = device_scan())) { @@ -330,65 +350,68 @@ static void show_dev_detail(void) num_devices = g_slist_length(devices); if (num_devices > 1) { - g_critical("%d devices found. Use --list-devices to show them, " - "and --device to select one.", num_devices); + g_critical("%d devices found. Use --scan to show them, " + "and select one to show.", num_devices); return; } sdi = devices->data; print_dev_line(sdi); - /* This properly opens and initializes the device, so we can get - * current settings. */ - sr_session_new(); - if (sr_session_dev_add(sdi) != SR_OK) { - g_critical("Failed to use device."); + if (sr_dev_open(sdi) != SR_OK) { + g_critical("Failed to open device."); 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 configuration 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"); } @@ -397,120 +420,178 @@ 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")))) { + uint64 = g_variant_get_fixed_array(gvar_list, + &num_elements, sizeof(uint64_t)); + printf(" - supported samplerates:\n"); + for (i = 0; i < num_elements; i++) { + if (!(s = sr_samplerate_string(uint64[i]))) + continue; + printf(" %s\n", s); + g_free(s); + } + g_variant_unref(gvar_list); + } else if ((gvar_list = g_variant_lookup_value(gvar_dict, + "samplerate-steps", G_VARIANT_TYPE("at")))) { + uint64 = 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(uint64[0]))) continue; printf(" (%s", s); g_free(s); /* high */ - if (!(s = sr_samplerate_string(samplerates->high))) + if (!(s = sr_samplerate_string(uint64[1]))) continue; printf(" - %s", s); g_free(s); /* step */ - if (!(s = sr_samplerate_string(samplerates->step))) + if (!(s = sr_samplerate_string(uint64[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; } + uint64 = 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", uint64[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++) - printf(" %s\n", sr_period_string( - rationals[i].p * rationals[i].q)); - - } 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) { - printf("\n"); - continue; - } - printf(" - supported trigger sources:\n"); - for (i = 0; stropts[i]; i++) - printf(" %s\n", stropts[i]); - - } 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) { - printf("\n"); - continue; + num_elements = g_variant_n_children(gvar_list); + for (i = 0; i < num_elements; i++) { + gvar = g_variant_get_child_value(gvar_list, i); + g_variant_get(gvar, "(tt)", &p, &q); + s = sr_period_string(p * q); + printf(" %s\n", s); + g_free(s); } - printf(" - supported filter targets:\n"); - for (i = 0; stropts[i]; i++) - printf(" %s\n", stropts[i]); + g_variant_unref(gvar_list); } 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])); + num_elements = g_variant_n_children(gvar_list); + for (i = 0; i < num_elements; i++) { + gvar = g_variant_get_child_value(gvar_list, i); + g_variant_get(gvar, "(tt)", &p, &q); + s = sr_voltage_string(p, q); + printf(" %s\n", s); + g_free(s); + } + g_variant_unref(gvar_list); + + } else if (srci->datatype == SR_T_CHAR) { + printf(" %s: ", srci->id); + if (sr_config_get(sdi->driver, srci->key, + &gvar, sdi) == 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, srci->key, + &gvar, sdi) != SR_OK) { + printf("\n"); + continue; + } - } 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) { + stropts = g_variant_get_strv(gvar, &num_elements); + for (i = 0; i < num_elements; i++) { + if (i) + printf(", "); + printf("%s", stropts[i]); + if (tmp_str && !strcmp(tmp_str, stropts[i])) + printf(" (current)"); + } + printf("\n"); + g_free(stropts); + g_free(tmp_str); + g_variant_unref(gvar); + + } else if (srci->datatype == SR_T_UINT64_RANGE) { + printf(" %s: ", srci->id); + if (sr_config_list(sdi->driver, srci->key, + &gvar_list, sdi) != SR_OK) { printf("\n"); continue; } - printf(" - supported coupling options:\n"); - for (i = 0; stropts[i]; i++) - printf(" %s\n", stropts[i]); - - } else if (srci->key == SR_CONF_DATALOG) { - /* 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"); + + if (sr_config_get(sdi->driver, srci->key, &gvar, sdi) == SR_OK) { + g_variant_get(gvar, "(tt)", &cur_low, &cur_high); + g_variant_unref(gvar); + } else { + cur_low = 0; + cur_high = 0; + } + + num_elements = g_variant_n_children(gvar_list); + for (i = 0; i < num_elements; i++) { + gvar = g_variant_get_child_value(gvar_list, i); + g_variant_get(gvar, "(tt)", &low, &high); + g_variant_unref(gvar); + if (i) + printf(", "); + printf("%"PRIu64"-%"PRIu64, low, high); + if (low == cur_low && high == cur_high) + printf(" (current)"); } - printf(")\n"); + printf("\n"); + g_variant_unref(gvar_list); + + } else if (srci->datatype == SR_T_BOOL) { + printf(" %s: ", srci->id); + if (sr_config_get(sdi->driver, srci->key, + &gvar, sdi) == SR_OK) { + if (g_variant_get_boolean(gvar)) + printf("on (current), off\n"); + else + printf("on, off (current)\n"); + g_variant_unref(gvar); + } else + printf("on, off\n"); + } else { + /* Everything else */ printf(" %s\n", srci->id); } } + g_variant_unref(gvar_opts); - sr_session_destroy(); + sr_dev_close(sdi); + g_slist_free(devices); } @@ -604,7 +685,7 @@ static GArray *get_enabled_logic_probes(const struct sr_dev_inst *sdi) } static void datafeed_in(const struct sr_dev_inst *sdi, - const struct sr_datafeed_packet *packet) + const struct sr_datafeed_packet *packet, void *cb_data) { const struct sr_datafeed_meta *meta; const struct sr_datafeed_logic *logic; @@ -616,11 +697,13 @@ 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; 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; + + (void) cb_data; /* If the first packet to come in isn't a header, don't even try. */ if (packet->type != SR_DF_HEADER && o == NULL) @@ -667,15 +750,17 @@ static void datafeed_in(const struct sr_dev_inst *sdi, unitsize = (logic_probelist->len + 7) / 8; #ifdef HAVE_SRD + GVariant *gvar; 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; @@ -687,12 +772,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" Hz", *samplerate); + samplerate = g_variant_get_uint64(src->data); + g_debug("cli: got samplerate %"PRIu64" Hz", samplerate); break; case SR_CONF_SAMPLE_INTERVAL: - samplerate = (uint64_t *)src->value; - g_debug("cli: got sample interval %"PRIu64" ms", *samplerate); + samplerate = g_variant_get_uint64(src->data); + g_debug("cli: got sample interval %"PRIu64" ms", samplerate); break; default: /* Unknown metadata is not an error. */ @@ -818,15 +903,15 @@ static void datafeed_in(const struct sr_dev_inst *sdi, break; } - if (o && o->format->recv) { - out = o->format->recv(o, sdi, packet); - if (out && out->len) { + if (o && o->format->receive) { + if (o->format->receive(o, sdi, packet, &out) == SR_OK && out) { fwrite(out->str, 1, out->len, outfile); fflush(outfile); + g_string_free(out, TRUE); } } - /* SR_DF_END needs to be handled after the output module's recv() + /* SR_DF_END needs to be handled after the output module's receive() * is called, so it can properly clean up that module etc. */ if (packet->type == SR_DF_END) { g_debug("cli: Received SR_DF_END"); @@ -859,7 +944,7 @@ static void datafeed_in(const struct sr_dev_inst *sdi, if (outfile && outfile != stdout) fclose(outfile); - if (opt_output_file && default_output_format) { + if (opt_output_file && default_output_format && savebuf->len) { if (sr_session_save(opt_output_file, sdi, savebuf->data, unitsize, savebuf->len / unitsize) != SR_OK) g_critical("Failed to save session."); @@ -929,7 +1014,7 @@ static int probes_to_gvar(struct srd_decoder *dec, GHashTable *hash, (GDestroyNotify)g_variant_unref); all_probes = g_slist_copy(dec->probes); - all_probes = g_slist_concat(all_probes, dec->opt_probes); + all_probes = g_slist_concat(all_probes, g_slist_copy(dec->opt_probes)); for (l = all_probes; l; l = l->next) { p = l->data; if (!(val_str = g_hash_table_lookup(hash, p->id))) @@ -1184,6 +1269,13 @@ int setup_output_format(void) int i; char *fmtspec; + if (opt_output_format && !strcmp(opt_output_format, "sigrok")) { + /* Doesn't really exist as an output module - this is + * the session save mode. */ + g_free(opt_output_format); + opt_output_format = NULL; + } + if (!opt_output_format) { opt_output_format = DEFAULT_OUTPUT_FORMAT; /* we'll need to remember this so when saving to a file @@ -1350,7 +1442,7 @@ static void load_input_file_format(void) return; sr_session_new(); - sr_session_datafeed_callback_add(datafeed_in); + sr_session_datafeed_callback_add(datafeed_in, NULL); if (sr_session_dev_add(in->sdi) != SR_OK) { g_critical("Failed to use device."); sr_session_destroy(); @@ -1370,7 +1462,7 @@ static void load_input_file(void) if (sr_session_load(opt_input_file) == SR_OK) { /* sigrok session file */ - sr_session_datafeed_callback_add(datafeed_in); + sr_session_datafeed_callback_add(datafeed_in, NULL); sr_session_start(); sr_session_run(); sr_session_stop(); @@ -1387,11 +1479,10 @@ static int set_dev_options(struct sr_dev_inst *sdi, GHashTable *args) GHashTableIter iter; gpointer key, value; int ret; - float tmp_float; - uint64_t tmp_u64; - struct sr_rational tmp_rat; + double tmp_double; + uint64_t tmp_u64, p, q, low, high; gboolean tmp_bool; - void *val; + GVariant *val, *rational[2], *range[2]; g_hash_table_iter_init(&iter, args); while (g_hash_table_iter_next(&iter, &key, &value)) { @@ -1411,31 +1502,45 @@ static int set_dev_options(struct sr_dev_inst *sdi, GHashTable *args) ret = sr_parse_sizestring(value, &tmp_u64); if (ret != SR_OK) break; - val = &tmp_u64; + val = g_variant_new_uint64(tmp_u64); break; case SR_T_CHAR: - val = value; + val = g_variant_new_string(value); break; case SR_T_BOOL: if (!value) tmp_bool = TRUE; else tmp_bool = sr_parse_boolstring(value); - val = &tmp_bool; + val = g_variant_new_boolean(tmp_bool); break; case SR_T_FLOAT: - tmp_float = strtof(value, NULL); - val = &tmp_float; + tmp_double = strtof(value, NULL); + val = g_variant_new_double(tmp_double); break; case SR_T_RATIONAL_PERIOD: - if ((ret = sr_parse_period(value, &tmp_rat)) != SR_OK) + if ((ret = sr_parse_period(value, &p, &q)) != SR_OK) break; - val = &tmp_rat; + rational[0] = g_variant_new_uint64(p); + rational[1] = g_variant_new_uint64(q); + val = g_variant_new_tuple(rational, 2); break; case SR_T_RATIONAL_VOLT: - if ((ret = sr_parse_voltage(value, &tmp_rat)) != SR_OK) + if ((ret = sr_parse_voltage(value, &p, &q)) != SR_OK) break; - val = &tmp_rat; + rational[0] = g_variant_new_uint64(p); + rational[1] = g_variant_new_uint64(q); + val = g_variant_new_tuple(rational, 2); + break; + case SR_T_UINT64_RANGE: + if (sscanf(value, "%"PRIu64"-%"PRIu64, &low, &high) != 2) { + ret = SR_ERR; + break; + } else { + range[0] = g_variant_new_uint64(low); + range[1] = g_variant_new_uint64(high); + val = g_variant_new_tuple(range, 2); + } break; default: ret = SR_ERR; @@ -1457,12 +1562,12 @@ static void set_options(void) GSList *devices; GHashTable *devargs; - if (!opt_dev) { + if (!opt_config) { g_critical("No setting specified."); return; } - if (!(devargs = parse_generic_arg(opt_dev, FALSE))) + if (!(devargs = parse_generic_arg(opt_config, FALSE))) return; if (!(devices = device_scan())) { @@ -1471,15 +1576,14 @@ static void set_options(void) } sdi = devices->data; - sr_session_new(); - if (sr_session_dev_add(sdi) != SR_OK) { - g_critical("Failed to use device."); + if (sr_dev_open(sdi) != SR_OK) { + g_critical("Failed to open device."); return; } set_dev_options(sdi, devargs); - sr_session_destroy(); + sr_dev_close(sdi); g_slist_free(devices); g_hash_table_destroy(devargs); @@ -1487,45 +1591,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; @@ -1535,6 +1633,7 @@ static void run_session(void) { GSList *devices; GHashTable *devargs; + GVariant *gvar; struct sr_dev_inst *sdi; int max_probes, i; char **triggerlist; @@ -1551,16 +1650,21 @@ static void run_session(void) sdi = devices->data; sr_session_new(); - sr_session_datafeed_callback_add(datafeed_in); + sr_session_datafeed_callback_add(datafeed_in, NULL); + + if (sr_dev_open(sdi) != SR_OK) { + g_critical("Failed to open device."); + return; + } if (sr_session_dev_add(sdi) != SR_OK) { - g_critical("Failed to use device."); + g_critical("Failed to add device to session."); sr_session_destroy(); return; } - if (opt_dev) { - if ((devargs = parse_generic_arg(opt_dev, FALSE))) { + if (opt_config) { + if ((devargs = parse_generic_arg(opt_config, FALSE))) { if (set_dev_options(sdi, devargs) != SR_OK) return; g_hash_table_destroy(devargs); @@ -1604,9 +1708,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; @@ -1614,9 +1722,13 @@ 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; + } + gvar = g_variant_new_uint64(limit_frames); + if (sr_config_set(sdi, SR_CONF_LIMIT_FRAMES, gvar) != SR_OK) { g_critical("Failed to configure frame limit."); sr_session_destroy(); return; @@ -1637,6 +1749,7 @@ static void run_session(void) if (opt_continuous) clear_anykey(); + sr_session_datafeed_callback_remove_all(); sr_session_destroy(); g_slist_free(devices); @@ -1661,16 +1774,18 @@ static void logger(const gchar *log_domain, GLogLevelFlags log_level, int main(int argc, char **argv) { - int ret = 1; GOptionContext *context; GError *error; + int ret; + char *help; g_log_set_default_handler(logger, NULL); - error = NULL; context = g_option_context_new(NULL); g_option_context_add_main_entries(context, optargs, NULL); + ret = 1; + error = NULL; if (!g_option_context_parse(context, &argc, &argv, &error)) { g_critical("%s", error->message); goto done; @@ -1708,7 +1823,7 @@ int main(int argc, char **argv) if (opt_version) show_version(); - else if (opt_list_devs) + else if (opt_scan_devs) show_dev_list(); #ifdef HAVE_SRD else if (opt_pds && opt_show) @@ -1722,8 +1837,11 @@ int main(int argc, char **argv) set_options(); else if (opt_samples || opt_time || opt_frames || opt_continuous) run_session(); - else - printf("%s", g_option_context_get_help(context, TRUE, NULL)); + else { + help = g_option_context_get_help(context, TRUE, NULL); + printf("%s", help); + g_free(help); + } #ifdef HAVE_SRD if (opt_pds)