X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=sigrok-cli.c;h=ac84e1d2144fb5e211f687629e336140b83250df;hp=0bf2d20ec9940f3b5499e36ed7e6d8c6b2fa57e8;hb=b4584f8dc3b0e7209b7ff819de2991cb09f5a4af;hpb=5cf23f529349de140ed24782264d27f5321a8cc7 diff --git a/sigrok-cli.c b/sigrok-cli.c index 0bf2d20..ac84e1d 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 * @@ -17,7 +17,10 @@ * along with this program. If not, see . */ -#include /* First, so we avoid a _POSIX_C_SOURCE warning. */ +#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,22 +45,32 @@ 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 struct srd_session *srd_sess = NULL; static GHashTable *pd_ann_visible = NULL; +static GHashTable *pd_meta_visible = NULL; +static GHashTable *pd_binary_visible = NULL; +#endif 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_probe_group = 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; +static gchar *opt_pd_meta = NULL; +static gchar *opt_pd_binary = NULL; +#endif static gchar *opt_input_format = NULL; static gchar *opt_output_format = NULL; static gchar *opt_show = NULL; @@ -66,18 +78,17 @@ static gchar *opt_time = NULL; static gchar *opt_samples = NULL; static gchar *opt_frames = NULL; static gchar *opt_continuous = NULL; +static gchar *opt_set = NULL; 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, @@ -88,16 +99,26 @@ static GOptionEntry optargs[] = { "Output format", NULL}, {"probes", 'p', 0, G_OPTION_ARG_STRING, &opt_probes, "Probes to use", NULL}, + {"probe-group", 'g', 0, G_OPTION_ARG_STRING, &opt_probe_group, + "Probe groups", NULL}, {"triggers", 't', 0, G_OPTION_ARG_STRING, &opt_triggers, "Trigger configuration", NULL}, {"wait-trigger", 'w', 0, G_OPTION_ARG_NONE, &opt_wait_trigger, "Wait for trigger", NULL}, - {"protocol-decoders", 'a', 0, G_OPTION_ARG_STRING, &opt_pds, +#ifdef HAVE_SRD + {"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}, + {"protocol-decoder-meta", 'M', 0, G_OPTION_ARG_STRING, &opt_pd_meta, + "Protocol decoder meta output to show", NULL}, + {"protocol-decoder-binary", 'B', 0, G_OPTION_ARG_STRING, &opt_pd_binary, + "Protocol decoder binary output 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, @@ -108,6 +129,7 @@ static GOptionEntry optargs[] = { "Number of frames to acquire", NULL}, {"continuous", 0, 0, G_OPTION_ARG_NONE, &opt_continuous, "Sample continuously", NULL}, + {"set", 0, 0, G_OPTION_ARG_NONE, &opt_set, "Set device options only", NULL}, {NULL, 0, 0, 0, NULL, NULL, NULL} }; @@ -132,7 +154,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); @@ -140,9 +162,32 @@ static GSList *hash_to_hwopt(GHashTable *hash) return opts; } +static struct sr_probe_group *select_probe_group(struct sr_dev_inst *sdi) +{ + struct sr_probe_group *pg; + GSList *l; + + if (!opt_probe_group) + return NULL; + + if (!sdi->probe_groups) { + g_critical("This device does not have any probe groups."); + return NULL; + } + + for (l = sdi->probe_groups; l; l = l->next) { + pg = l->data; + if (!strcasecmp(opt_probe_group, pg->name)) { + return pg; + } + } + + return NULL; +} + static void free_drvopts(struct sr_config *src) { - g_free((void *)src->value); + g_variant_unref(src->data); g_free(src); } @@ -167,18 +212,25 @@ static GSList *device_scan(void) } if (!driver) { g_critical("Driver %s not found.", drvname); + g_hash_table_destroy(drvargs); + g_free(drvname); return NULL; } g_free(drvname); if (sr_driver_init(sr_ctx, driver) != SR_OK) { g_critical("Failed to initialize driver."); + g_hash_table_destroy(drvargs); 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 { @@ -203,19 +255,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(); @@ -234,8 +290,10 @@ 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 if (srd_init(NULL) == SRD_OK) { printf("Supported protocol decoders:\n"); srd_decoder_load_all(); @@ -249,32 +307,46 @@ static void show_version(void) srd_exit(); } printf("\n"); +#endif } 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, sdi, NULL, SR_CONF_CONN, &gvar) == 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) @@ -298,13 +370,17 @@ 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, n, i; - char *s, *title; + struct sr_probe *probe; + struct sr_probe_group *probe_group, *pg; + GSList *devices, *pgl, *prl; + 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())) { @@ -314,67 +390,90 @@ static void show_dev_detail(void) num_devices = g_slist_length(devices); if (num_devices > 1) { - if (!opt_dev) { - g_critical("%d devices found. Use --list-devices to show them, " - "and --device to select one.", num_devices); - return; - } - /* opt_dev is NULL if not specified, which is fine. */ - n = strtol(opt_dev, NULL, 10); - if (n >= num_devices) { - g_critical("%d devices found, numbered starting from 0.", - num_devices); - return; - } - sdi = g_slist_nth_data(devices, n); - } else - sdi = g_slist_nth_data(devices, 0); + 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); - 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_dev_open(sdi) != SR_OK) { + g_critical("Failed to open device."); + return; } - if ((sr_info_get(sdi->driver, SR_DI_HWOPTS, (const void **)&hwopts, - NULL) == SR_OK) && hwopts) { + if ((sr_config_list(sdi->driver, NULL, NULL, SR_CONF_SCAN_OPTIONS, + &gvar_opts) == 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_info_get(sdi->driver, SR_DI_HWCAPS, (const void **)&hwcaps, - NULL) != SR_OK) || !hwcaps) + probe_group = select_probe_group(sdi); + if ((sr_config_list(sdi->driver, sdi, probe_group, SR_CONF_DEVICE_OPTIONS, + &gvar_opts)) != SR_OK) /* Driver supports no device instance options. */ return; - for (cap = 0; hwcaps[cap]; cap++) { - if (!(srci = sr_config_info_get(hwcaps[cap]))) + if (sdi->probe_groups) { + printf("Probe groups:\n"); + for (pgl = sdi->probe_groups; pgl; pgl = pgl->next) { + pg = pgl->data; + printf(" %s: channel%s", pg->name, + g_slist_length(pg->probes) > 1 ? "s" : ""); + for (prl = pg->probes; prl; prl = prl->next) { + probe = prl->data; + printf(" %s", probe->name); + } + printf("\n"); + } + } + + printf("Supported configuration options"); + if (sdi->probe_groups) { + if (!probe_group) + printf(" across all probe groups"); + else + printf(" on probe group %s", probe_group->name); + } + 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]))) continue; - if (title) { - printf("%s", title); - title = NULL; - } + if (srci->key == SR_CONF_TRIGGER_TYPE) { + if (sr_config_list(sdi->driver, sdi, probe_group, srci->key, + &gvar) != 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, sdi, probe_group, srci->key, + &gvar) == 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"); } @@ -382,123 +481,196 @@ static void show_dev_detail(void) } else if (srci->key == SR_CONF_SAMPLERATE) { /* Supported samplerates */ printf(" %s", srci->id); - if (sr_config_list(sdi->driver, SR_CONF_SAMPLERATE, - (const void **)&samplerates, sdi) != SR_OK) { + if (sr_config_list(sdi->driver, sdi, probe_group, SR_CONF_SAMPLERATE, + &gvar_dict) != 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) { + if (sr_config_list(sdi->driver, sdi, probe_group, + SR_CONF_BUFFERSIZE, &gvar_list) != 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) { + if (sr_config_list(sdi->driver, sdi, probe_group, + SR_CONF_TIMEBASE, &gvar_list) != 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)); + 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); + } + g_variant_unref(gvar_list); - } else if (srci->key == SR_CONF_TRIGGER_SOURCE) { - /* Supported trigger sources */ + } else if (srci->key == SR_CONF_VDIV) { + /* Supported volts/div values */ printf(" %s", srci->id); - if (sr_config_list(sdi->driver, SR_CONF_TRIGGER_SOURCE, - (const void **)&stropts, sdi) != SR_OK) { + if (sr_config_list(sdi->driver, sdi, probe_group, + SR_CONF_VDIV, &gvar_list) != 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(" - supported volts/div:\n"); + 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, sdi, probe_group, srci->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, probe_group, srci->key, + &gvar) != SR_OK) { printf("\n"); continue; } - printf(" - supported filter targets:\n"); - for (i = 0; stropts[i]; i++) - printf(" %s\n", stropts[i]); - } 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) { + 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, sdi, probe_group, srci->key, + &gvar_list) != 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])); - } 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) { - printf("\n"); - continue; + if (sr_config_get(sdi->driver, sdi, NULL, srci->key, &gvar) == 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(" - supported coupling options:\n"); - for (i = 0; stropts[i]; i++) - printf(" %s\n", stropts[i]); + printf("\n"); + g_variant_unref(gvar_list); + + } else if (srci->datatype == SR_T_BOOL) { + printf(" %s: ", srci->id); + if (sr_config_get(sdi->driver, sdi, NULL, srci->key, + &gvar) == 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_dev_close(sdi); + g_slist_free(devices); } +#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; @@ -515,7 +687,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) { @@ -536,6 +707,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); @@ -545,6 +725,7 @@ static void show_pd_detail(void) g_strfreev(pdtokens); } +#endif static GArray *get_enabled_logic_probes(const struct sr_dev_inst *sdi) { @@ -566,7 +747,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; @@ -578,11 +759,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, end_sample; 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) @@ -628,55 +811,25 @@ 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 + GVariant *gvar; if (opt_pds && logic_probelist->len) { - if (sr_info_get(sdi->driver, SR_CONF_SAMPLERATE, - (const void **)&samplerate, sdi) != SR_OK) { - g_critical("Unable to initialize protocol " - "decoders: no samplerate found."); - break; + if (sr_config_get(sdi->driver, sdi, NULL, SR_CONF_SAMPLERATE, + &gvar) == SR_OK) { + samplerate = g_variant_get_uint64(gvar); + g_variant_unref(gvar); + if (srd_session_metadata_set(srd_sess, SRD_CONF_SAMPLERATE, + g_variant_new_uint64(samplerate)) != SRD_OK) { + g_critical("Failed to configure decode session."); + break; + } } - srd_session_start(logic_probelist->len, unitsize, - *samplerate); - } - break; - - case SR_DF_END: - g_debug("cli: Received SR_DF_END"); - if (!o) { - g_debug("cli: double end!"); - break; - } - if (o->format->event) { - o->format->event(o, SR_DF_END, &output_buf, &output_len); - if (output_buf) { - if (outfile) - fwrite(output_buf, 1, output_len, outfile); - g_free(output_buf); - output_len = 0; + if (srd_session_start(srd_sess) != SRD_OK) { + g_critical("Failed to start decode session."); + break; } } - if (limit_samples && received_samples < limit_samples) - g_warning("Device only sent %" PRIu64 " samples.", - received_samples); - if (opt_continuous) - g_warning("Device stopped after %" PRIu64 " samples.", - received_samples); - - if (outfile && outfile != stdout) - fclose(outfile); - - if (opt_output_file && default_output_format) { - if (sr_session_save(opt_output_file, sdi, savebuf->data, - unitsize, savebuf->len / unitsize) != SR_OK) - g_critical("Failed to save session."); - g_byte_array_free(savebuf, FALSE); - } - - g_array_free(logic_probelist, TRUE); - if (o->format->cleanup) - o->format->cleanup(o); - g_free(o); - o = NULL; +#endif break; case SR_DF_META: @@ -686,8 +839,20 @@ 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); +#ifdef HAVE_SRD + if (opt_pds) { + if (srd_session_metadata_set(srd_sess, SRD_CONF_SAMPLERATE, + g_variant_new_uint64(samplerate)) != SRD_OK) { + g_critical("Failed to pass samplerate to decoder."); + } + } +#endif + 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. */ @@ -724,9 +889,10 @@ static void datafeed_in(const struct sr_dev_inst *sdi, if (ret != SR_OK) break; - /* What comes out of the filter is guaranteed to be packed into the + /* + * What comes out of the filter is guaranteed to be packed into the * minimum size needed to support the number of samples at this sample - * size. however, the driver may have submitted too much -- cut off + * size. however, the driver may have submitted too much. Cut off * the buffer of the last packet according to the sample limit. */ if (limit_samples && (received_samples + logic->length / sample_size > @@ -738,15 +904,18 @@ static void datafeed_in(const struct sr_dev_inst *sdi, g_byte_array_append(savebuf, filter_out, filter_out_len); } else { if (opt_pds) { - if (srd_session_send(received_samples, (uint8_t*)filter_out, - filter_out_len) != SRD_OK) +#ifdef HAVE_SRD + end_sample = received_samples + filter_out_len / unitsize; + if (srd_session_send(srd_sess, received_samples, end_sample, + (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) o->format->data(o, filter_out, filter_out_len, &output_buf, &output_len); - if (output_buf) { + if (output_len) { fwrite(output_buf, 1, output_len, outfile); fflush(outfile); g_free(output_buf); @@ -811,16 +980,140 @@ 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 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"); + + if (o->format->event) { + o->format->event(o, SR_DF_END, &output_buf, &output_len); + if (output_buf) { + if (outfile) + fwrite(output_buf, 1, output_len, outfile); + g_free(output_buf); + output_len = 0; + } + } + + if (limit_samples && received_samples < limit_samples) + g_warning("Device only sent %" PRIu64 " samples.", + received_samples); + + if (opt_continuous) + g_warning("Device stopped after %" PRIu64 " samples.", + received_samples); + + g_array_free(logic_probelist, TRUE); + + if (o->format->cleanup) + o->format->cleanup(o); + g_free(o); + o = NULL; + + if (outfile && outfile != stdout) + fclose(outfile); + + 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."); + g_byte_array_free(savebuf, FALSE); } } } +#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, 0); + 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, 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))) + /* 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 @@ -828,23 +1121,25 @@ 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; (void)dev; - ret = 0; pd_ann_visible = g_hash_table_new_full(g_str_hash, g_int_equal, g_free, NULL); + ret = 0; 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")); @@ -852,12 +1147,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 (!(di = srd_inst_new(pd_name, pd_opthash))) { + 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(srd_sess, 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. @@ -866,24 +1180,22 @@ static int register_pds(struct sr_dev *dev, const char *pdstring) */ if (!opt_pd_annotations) g_hash_table_insert(pd_ann_visible, - g_strdup(di->inst_id), NULL); + g_strdup(di->inst_id), GINT_TO_POINTER(-1)); - /* 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); @@ -912,7 +1224,7 @@ int setup_pd_stack(void) /* First PD goes at the bottom of the stack. */ ids = g_strsplit(pds[0], ":", 0); - if (!(di_from = srd_inst_find_by_id(ids[0]))) { + if (!(di_from = srd_inst_find_by_id(srd_sess, ids[0]))) { g_strfreev(ids); g_critical("Cannot stack protocol decoder '%s': " "instance not found.", pds[0]); @@ -923,14 +1235,14 @@ int setup_pd_stack(void) /* Every subsequent PD goes on top. */ for (i = 1; pds[i]; i++) { ids = g_strsplit(pds[i], ":", 0); - if (!(di_to = srd_inst_find_by_id(ids[0]))) { + if (!(di_to = srd_inst_find_by_id(srd_sess, ids[0]))) { g_strfreev(ids); g_critical("Cannot stack protocol decoder '%s': " "instance not found.", pds[i]); return 1; } g_strfreev(ids); - if ((ret = srd_inst_stack(di_from, di_to)) != SRD_OK) + if ((ret = srd_inst_stack(srd_sess, di_from, di_to)) != SRD_OK) return 1; /* Don't show annotation from this PD. Only the last PD in @@ -953,46 +1265,197 @@ int setup_pd_annotations(void) { GSList *l; struct srd_decoder *dec; - int ann; + int ann_class; char **pds, **pdtok, **keyval, **ann_descr; /* Set up custom list of PDs and annotations to show. */ - if (opt_pd_annotations) { - pds = g_strsplit(opt_pd_annotations, ",", 0); - for (pdtok = pds; *pdtok && **pdtok; pdtok++) { - ann = 0; - keyval = g_strsplit(*pdtok, "=", 0); - if (!(dec = srd_decoder_get_by_id(keyval[0]))) { - g_critical("Protocol decoder '%s' not found.", keyval[0]); - return 1; + pds = g_strsplit(opt_pd_annotations, ",", 0); + for (pdtok = pds; *pdtok && **pdtok; pdtok++) { + keyval = g_strsplit(*pdtok, "=", 0); + if (!(dec = srd_decoder_get_by_id(keyval[0]))) { + g_critical("Protocol decoder '%s' not found.", keyval[0]); + return 1; + } + if (!dec->annotations) { + g_critical("Protocol decoder '%s' has no annotations.", keyval[0]); + return 1; + } + ann_class = 0; + if (g_strv_length(keyval) == 2) { + for (l = dec->annotations; l; l = l->next, ann_class++) { + ann_descr = l->data; + if (!canon_cmp(ann_descr[0], keyval[1])) + /* Found it. */ + break; } - if (!dec->annotations) { - g_critical("Protocol decoder '%s' has no annotations.", keyval[0]); + if (!l) { + g_critical("Annotation '%s' not found " + "for protocol decoder '%s'.", keyval[1], keyval[0]); return 1; } - if (g_strv_length(keyval) == 2) { - for (l = dec->annotations; l; l = l->next, ann++) { - ann_descr = l->data; - if (!canon_cmp(ann_descr[0], keyval[1])) - /* Found it. */ - break; - } - if (!l) { - g_critical("Annotation '%s' not found " - "for protocol decoder '%s'.", keyval[1], keyval[0]); - return 1; - } + g_debug("cli: Showing protocol decoder %s annotation " + "class %d (%s).", keyval[0], ann_class, ann_descr[0]); + } else { + /* No class specified: show all of them. */ + ann_class = -1; + g_debug("cli: Showing all annotation classes for protocol " + "decoder %s.", keyval[0]); + } + g_hash_table_insert(pd_ann_visible, g_strdup(keyval[0]), GINT_TO_POINTER(ann_class)); + g_strfreev(keyval); + } + g_strfreev(pds); + + return 0; +} + +int setup_pd_meta(void) +{ + struct srd_decoder *dec; + char **pds, **pdtok; + + pd_meta_visible = g_hash_table_new_full(g_str_hash, g_int_equal, + g_free, NULL); + pds = g_strsplit(opt_pd_meta, ",", 0); + for (pdtok = pds; *pdtok && **pdtok; pdtok++) { + if (!(dec = srd_decoder_get_by_id(*pdtok))) { + g_critical("Protocol decoder '%s' not found.", *pdtok); + return 1; + } + g_debug("cli: Showing protocol decoder meta output from '%s'.", *pdtok); + g_hash_table_insert(pd_meta_visible, g_strdup(*pdtok), NULL); + } + g_strfreev(pds); + + return 0; +} + +int setup_pd_binary(void) +{ + GSList *l; + struct srd_decoder *dec; + int bin_class; + char **pds, **pdtok, **keyval, *bin_name; + + pd_binary_visible = g_hash_table_new_full(g_str_hash, g_int_equal, + g_free, NULL); + pds = g_strsplit(opt_pd_binary, ",", 0); + for (pdtok = pds; *pdtok && **pdtok; pdtok++) { + keyval = g_strsplit(*pdtok, "=", 0); + if (!(dec = srd_decoder_get_by_id(keyval[0]))) { + g_critical("Protocol decoder '%s' not found.", keyval[0]); + return 1; + } + if (!dec->binary) { + g_critical("Protocol decoder '%s' has no binary output.", keyval[0]); + return 1; + } + bin_class = 0; + if (g_strv_length(keyval) == 2) { + for (l = dec->binary; l; l = l->next, bin_class++) { + bin_name = l->data; + if (!canon_cmp(bin_name, keyval[1])) + /* Found it. */ + break; } - g_debug("cli: showing protocol decoder annotation %d from '%s'", ann, keyval[0]); - g_hash_table_insert(pd_ann_visible, g_strdup(keyval[0]), GINT_TO_POINTER(ann)); - g_strfreev(keyval); + if (!l) { + g_critical("binary output '%s' not found " + "for protocol decoder '%s'.", keyval[1], keyval[0]); + return 1; + } + g_debug("cli: Showing protocol decoder %s binary class " + "%d (%s).", keyval[0], bin_class, bin_name); + } else { + /* No class specified: output all of them. */ + bin_class = -1; + g_debug("cli: Showing all binary classes for protocol " + "decoder %s.", keyval[0]); } - g_strfreev(pds); + g_hash_table_insert(pd_binary_visible, g_strdup(keyval[0]), GINT_TO_POINTER(bin_class)); + g_strfreev(keyval); } + g_strfreev(pds); return 0; } +void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data) +{ + struct srd_proto_data_annotation *pda; + gpointer ann_format; + int 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; + + format = GPOINTER_TO_INT(ann_format); + pda = pdata->data; + if (format != -1 && pda->ann_format != format) + /* We don't want this particular format from the PD. */ + return; + + if (opt_loglevel > SR_LOG_WARN) + printf("%"PRIu64"-%"PRIu64" ", pdata->start_sample, pdata->end_sample); + printf("%s: ", pdata->pdo->proto_id); + /* Show only the longest annotation. */ + printf("\"%s\" ", pda->ann_text[0]); + printf("\n"); + fflush(stdout); +} + +void show_pd_meta(struct srd_proto_data *pdata, void *cb_data) +{ + + /* 'cb_data' is not used in this specific callback. */ + (void)cb_data; + + if (!g_hash_table_lookup_extended(pd_meta_visible, + pdata->pdo->di->decoder->id, NULL, NULL)) + /* Not in the list of PDs whose meta output we're showing. */ + return; + + if (opt_loglevel > SR_LOG_WARN) + printf("%"PRIu64"-%"PRIu64" ", pdata->start_sample, pdata->end_sample); + printf("%s: ", pdata->pdo->proto_id); + printf("%s: %s", pdata->pdo->meta_name, g_variant_print(pdata->data, FALSE)); + printf("\n"); + fflush(stdout); +} + +void show_pd_binary(struct srd_proto_data *pdata, void *cb_data) +{ + struct srd_proto_data_binary *pdb; + gpointer classp; + int class; + + /* 'cb_data' is not used in this specific callback. */ + (void)cb_data; + + if (!g_hash_table_lookup_extended(pd_binary_visible, + pdata->pdo->di->decoder->id, NULL, (void **)&classp)) + /* Not in the list of PDs whose meta output we're showing. */ + return; + + class = GPOINTER_TO_INT(classp); + pdb = pdata->data; + if (class != -1 && class != pdb->bin_class) + /* Not showing this binary class. */ + return; + + /* Just send the binary output to stdout, no embellishments. */ + fwrite(pdb->data, pdb->size, 1, stdout); + fflush(stdout); +} +#endif + int setup_output_format(void) { GHashTable *fmtargs; @@ -1002,6 +1465,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 @@ -1040,37 +1510,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; @@ -1189,7 +1628,7 @@ static void load_input_file_format(void) in->format = input_format; in->param = fmtargs; if (in->format->init) { - if (in->format->init(in) != SR_OK) { + if (in->format->init(in, opt_input_file) != SR_OK) { g_critical("Input format init failed."); exit(1); } @@ -1199,7 +1638,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(); @@ -1219,7 +1658,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(); @@ -1233,14 +1672,14 @@ static void load_input_file(void) static int set_dev_options(struct sr_dev_inst *sdi, GHashTable *args) { const struct sr_config_info *srci; + struct sr_probe_group *pg; 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)) { @@ -1260,37 +1699,53 @@ 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; } - if (val) - ret = sr_dev_config_set(sdi, srci->key, val); + if (val) { + pg = select_probe_group(sdi); + ret = sr_config_set(sdi, pg, srci->key, val); + } if (ret != SR_OK) { g_critical("Failed to set device option '%s'.", (char *)key); return ret; @@ -1300,47 +1755,74 @@ static int set_dev_options(struct sr_dev_inst *sdi, GHashTable *args) return SR_OK; } +static void set_options(void) +{ + struct sr_dev_inst *sdi; + GSList *devices; + GHashTable *devargs; + + if (!opt_config) { + g_critical("No setting specified."); + return; + } + + if (!(devargs = parse_generic_arg(opt_config, FALSE))) + return; + + if (!(devices = device_scan())) { + g_critical("No devices found."); + return; + } + sdi = devices->data; + + if (sr_dev_open(sdi) != SR_OK) { + g_critical("Failed to open device."); + return; + } + + set_dev_options(sdi, devargs); + + sr_dev_close(sdi); + g_slist_free(devices); + g_hash_table_destroy(devargs); + +} + 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_driver_hwcap_exists(sdi->driver, SR_CONF_LIMIT_MSEC)) { - if (sr_dev_config_set(sdi, SR_CONF_LIMIT_MSEC, &time_msec) != SR_OK) { + if (sr_dev_has_option(sdi, SR_CONF_LIMIT_MSEC)) { + gvar = g_variant_new_uint64(time_msec); + if (sr_config_set(sdi, NULL, 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_hwcap(sdi, SR_CONF_SAMPLERATE)) { - sr_info_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, sdi, NULL, SR_CONF_SAMPLERATE, &gvar); + 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_dev_config_set(sdi, SR_CONF_LIMIT_SAMPLES, - &limit_samples) != SR_OK) { + gvar = g_variant_new_uint64(limit_samples); + if (sr_config_set(sdi, NULL, 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; @@ -1350,6 +1832,7 @@ static void run_session(void) { GSList *devices; GHashTable *devargs; + GVariant *gvar; struct sr_dev_inst *sdi; int max_probes, i; char **triggerlist; @@ -1366,16 +1849,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); @@ -1404,7 +1892,7 @@ static void run_session(void) } if (opt_continuous) { - if (!sr_driver_hwcap_exists(sdi->driver, SR_CONF_CONTINUOUS)) { + if (!sr_dev_has_option(sdi, SR_CONF_CONTINUOUS)) { g_critical("This device does not support continuous sampling."); sr_session_destroy(); return; @@ -1419,9 +1907,13 @@ static void run_session(void) } if (opt_samples) { - if ((sr_parse_sizestring(opt_samples, &limit_samples) != SR_OK) - || (sr_dev_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, NULL, SR_CONF_LIMIT_SAMPLES, gvar) != SR_OK) { g_critical("Failed to configure sample limit."); sr_session_destroy(); return; @@ -1429,9 +1921,13 @@ static void run_session(void) } if (opt_frames) { - if ((sr_parse_sizestring(opt_frames, &limit_frames) != SR_OK) - || (sr_dev_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, NULL, SR_CONF_LIMIT_FRAMES, gvar) != SR_OK) { g_critical("Failed to configure frame limit."); sr_session_destroy(); return; @@ -1452,6 +1948,7 @@ static void run_session(void) if (opt_continuous) clear_anykey(); + sr_session_datafeed_callback_remove_all(); sr_session_destroy(); g_slist_free(devices); @@ -1472,20 +1969,26 @@ static void logger(const gchar *log_domain, GLogLevelFlags log_level, fprintf(stderr, "%s\n", message); fflush(stderr); } + + if (log_level & (G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL)) + exit(1); + } 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; @@ -1495,47 +1998,79 @@ 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) { if (srd_init(NULL) != SRD_OK) goto done; - if (register_pds(NULL, opt_pds) != 0) + if (srd_session_new(&srd_sess) != SRD_OK) { + g_critical("Failed to create new decode session."); goto done; - if (srd_pd_output_callback_add(SRD_OUTPUT_ANN, - show_pd_annotations, NULL) != SRD_OK) + } + if (register_pds(NULL, opt_pds) != 0) goto done; if (setup_pd_stack() != 0) goto done; - if (setup_pd_annotations() != 0) - goto done; + + /* Only one output type is ever shown. */ + if (opt_pd_binary) { + if (setup_pd_binary() != 0) + goto done; + if (srd_pd_output_callback_add(srd_sess, SRD_OUTPUT_BINARY, + show_pd_binary, NULL) != SRD_OK) + goto done; + } else if (opt_pd_meta) { + if (setup_pd_meta() != 0) + goto done; + if (srd_pd_output_callback_add(srd_sess, SRD_OUTPUT_META, + show_pd_meta, NULL) != SRD_OK) + goto done; + } else { + if (opt_pd_annotations) + if (setup_pd_annotations() != 0) + goto done; + if (srd_pd_output_callback_add(srd_sess, SRD_OUTPUT_ANN, + show_pd_annotations, NULL) != SRD_OK) + goto done; + } } +#endif if (setup_output_format() != 0) goto done; 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) show_pd_detail(); +#endif else if (opt_show) show_dev_detail(); else if (opt_input_file) load_input_file(); + else if (opt_set) + 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) srd_exit(); +#endif ret = 0;