X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=sigrok-cli.c;h=ac84e1d2144fb5e211f687629e336140b83250df;hp=e0860aeaa43f7aaa40cfaaea1534d8ba9f67f9e9;hb=b4584f8dc3b0e7209b7ff819de2991cb09f5a4af;hpb=d79d480604b5c9d0946f6e25c638bdfae1b8961d diff --git a/sigrok-cli.c b/sigrok-cli.c index e0860ae..ac84e1d 100644 --- a/sigrok-cli.c +++ b/sigrok-cli.c @@ -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 @@ -46,24 +46,30 @@ 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; @@ -78,13 +84,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, @@ -95,18 +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}, #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}, + {"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, @@ -150,6 +162,29 @@ 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_variant_unref(src->data); @@ -177,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 { @@ -248,6 +290,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 @@ -276,7 +319,7 @@ static void print_dev_line(const struct sr_dev_inst *sdi) 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) { + 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); @@ -327,12 +370,16 @@ static void show_dev_detail(void) { struct sr_dev_inst *sdi; const struct sr_config_info *srci; - GSList *devices; + 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; + const uint64_t *uint64, p, q, low, high; + uint64_t cur_low, cur_high; const int32_t *opts; - unsigned int num_devices, tmp_bool, o, i; + unsigned int num_devices, o, i; + char *tmp_str; char *s; const char *charopts, **stropts; @@ -343,7 +390,7 @@ 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, " + g_critical("%d devices found. Use --scan to show them, " "and select one to show.", num_devices); return; } @@ -356,8 +403,8 @@ static void show_dev_detail(void) return; } - if ((sr_config_list(sdi->driver, SR_CONF_SCAN_OPTIONS, &gvar_opts, - NULL) == SR_OK)) { + 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"); @@ -369,20 +416,42 @@ static void show_dev_detail(void) g_variant_unref(gvar_opts); } - if ((sr_config_list(sdi->driver, SR_CONF_DEVICE_OPTIONS, &gvar_opts, - sdi) != SR_OK)) + 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; - printf("Supported device options:\n"); + 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 (srci->key == SR_CONF_TRIGGER_TYPE) { - if (sr_config_list(sdi->driver, srci->key, &gvar, - sdi) != SR_OK) { + if (sr_config_list(sdi->driver, sdi, probe_group, srci->key, + &gvar) != SR_OK) { printf("\n"); continue; } @@ -398,8 +467,8 @@ static void show_dev_detail(void) } else if (srci->key == SR_CONF_PATTERN_MODE) { /* Pattern generator modes */ printf(" %s", srci->id); - if (sr_config_list(sdi->driver, srci->key, &gvar, - sdi) == SR_OK) { + if (sr_config_list(sdi->driver, sdi, probe_group, srci->key, + &gvar) == SR_OK) { printf(" - supported patterns:\n"); stropts = g_variant_get_strv(gvar, &num_elements); for (i = 0; i < num_elements; i++) @@ -412,8 +481,8 @@ 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, - &gvar_dict, sdi) != SR_OK) { + if (sr_config_list(sdi->driver, sdi, probe_group, SR_CONF_SAMPLERATE, + &gvar_dict) != SR_OK) { printf("\n"); continue; } @@ -422,9 +491,14 @@ static void show_dev_detail(void) uint64 = 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(uint64[i])); - } if ((gvar_list = g_variant_lookup_value(gvar_dict, + 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)); @@ -450,8 +524,8 @@ static void show_dev_detail(void) } else if (srci->key == SR_CONF_BUFFERSIZE) { /* Supported buffer sizes */ printf(" %s", srci->id); - if (sr_config_list(sdi->driver, SR_CONF_BUFFERSIZE, - &gvar_list, sdi) != SR_OK) { + if (sr_config_list(sdi->driver, sdi, probe_group, + SR_CONF_BUFFERSIZE, &gvar_list) != SR_OK) { printf("\n"); continue; } @@ -465,8 +539,8 @@ static void show_dev_detail(void) } else if (srci->key == SR_CONF_TIMEBASE) { /* Supported time bases */ printf(" %s", srci->id); - if (sr_config_list(sdi->driver, SR_CONF_TIMEBASE, - &gvar_list, sdi) != SR_OK) { + if (sr_config_list(sdi->driver, sdi, probe_group, + SR_CONF_TIMEBASE, &gvar_list) != SR_OK) { printf("\n"); continue; } @@ -481,39 +555,11 @@ static void show_dev_detail(void) } 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, - &gvar, sdi) != SR_OK) { - printf("\n"); - continue; - } - printf(" - supported trigger sources:\n"); - 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, - &gvar, sdi) != SR_OK) { - printf("\n"); - continue; - } - printf(" - supported filter targets:\n"); - 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, - &gvar_list, sdi) != SR_OK) { + if (sr_config_list(sdi->driver, sdi, probe_group, + SR_CONF_VDIV, &gvar_list) != SR_OK) { printf("\n"); continue; } @@ -528,31 +574,78 @@ static void show_dev_detail(void) } 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, - &gvar, sdi) != SR_OK) { + } 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 coupling options:\n"); + stropts = g_variant_get_strv(gvar, &num_elements); - for (i = 0; i < num_elements; i++) - printf(" %s\n", stropts[i]); + 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->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, - &gvar, sdi) == SR_OK) { - tmp_bool = g_variant_get_boolean(gvar); - printf(", currently %s", tmp_bool ? "on" : "off"); + } 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; + } + + 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; } - printf(")\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)", &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"); + 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); } @@ -560,6 +653,7 @@ static void show_dev_detail(void) g_variant_unref(gvar_opts); sr_dev_close(sdi); + g_slist_free(devices); } @@ -667,9 +761,8 @@ static void datafeed_in(const struct sr_dev_inst *sdi, 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, end_sample; uint8_t *output_buf, *filter_out; (void) cb_data; @@ -719,16 +812,22 @@ 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, - &gvar, sdi) != SR_OK) { - g_critical("Unable to initialize protocol " - "decoders: no samplerate found."); + 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; + } + } + if (srd_session_start(srd_sess) != SRD_OK) { + g_critical("Failed to start decode session."); break; } - samplerate = g_variant_get_uint64(gvar); - g_variant_unref(gvar); - srd_session_start(logic_probelist->len, unitsize, samplerate); } #endif break; @@ -742,6 +841,14 @@ static void datafeed_in(const struct sr_dev_inst *sdi, case SR_CONF_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); @@ -782,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 > @@ -797,8 +905,9 @@ static void datafeed_in(const struct sr_dev_inst *sdi, } else { if (opt_pds) { #ifdef HAVE_SRD - if (srd_session_send(received_samples, (uint8_t*)filter_out, - filter_out_len) != SRD_OK) + 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 { @@ -912,7 +1021,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."); @@ -945,7 +1054,7 @@ static int opts_to_gvar(struct srd_decoder *dec, GHashTable *hash, 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); + 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); @@ -982,7 +1091,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))) @@ -1021,9 +1130,9 @@ static int register_pds(struct sr_dev *dev, const char *pdstring) (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 = options = probes = NULL; pdtokens = g_strsplit(pdstring, ",", 0); @@ -1059,7 +1168,7 @@ static int register_pds(struct sr_dev *dev, const char *pdstring) break; } - if (!(di = srd_inst_new(pd_name, options))) { + if (!(di = srd_inst_new(srd_sess, pd_name, options))) { g_critical("Failed to instantiate protocol decoder %s.", pd_name); ret = 1; break; @@ -1071,7 +1180,7 @@ 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)); /* Remap the probes if needed. */ if (srd_inst_probe_set_all(di, probes) != SRD_OK) { @@ -1115,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]); @@ -1126,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 @@ -1156,51 +1265,125 @@ 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) { - int i; - char **annotations; + struct srd_proto_data_annotation *pda; gpointer ann_format; + int format; /* 'cb_data' is not used in this specific callback. */ (void)cb_data; @@ -1213,19 +1396,64 @@ void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data) /* Not in the list of PDs whose annotations we're showing. */ return; - if (pdata->ann_format != GPOINTER_TO_INT(ann_format)) + 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; - 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]); + /* 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) @@ -1237,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 @@ -1437,13 +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; double tmp_double; - uint64_t tmp_u64, p, q; + uint64_t tmp_u64, p, q, low, high; gboolean tmp_bool; - GVariant *val, *rational[2]; + GVariant *val, *rational[2], *range[2]; g_hash_table_iter_init(&iter, args); while (g_hash_table_iter_next(&iter, &key, &value)) { @@ -1493,11 +1729,23 @@ static int set_dev_options(struct sr_dev_inst *sdi, GHashTable *args) 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_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; @@ -1513,12 +1761,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())) { @@ -1553,13 +1801,13 @@ static int set_limit_time(const struct sr_dev_inst *sdi) if (sr_dev_has_option(sdi, SR_CONF_LIMIT_MSEC)) { gvar = g_variant_new_uint64(time_msec); - if (sr_config_set(sdi, SR_CONF_LIMIT_MSEC, gvar) != SR_OK) { + if (sr_config_set(sdi, NULL, SR_CONF_LIMIT_MSEC, gvar) != SR_OK) { g_critical("Failed to configure time limit."); return SR_ERR; } } 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); + 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; @@ -1568,7 +1816,7 @@ static int set_limit_time(const struct sr_dev_inst *sdi) return SR_ERR; } gvar = g_variant_new_uint64(limit_samples); - if (sr_config_set(sdi, SR_CONF_LIMIT_SAMPLES, gvar) != SR_OK) { + if (sr_config_set(sdi, NULL, SR_CONF_LIMIT_SAMPLES, gvar) != SR_OK) { g_critical("Failed to configure time-based sample limit."); return SR_ERR; } @@ -1614,8 +1862,8 @@ static void run_session(void) 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); @@ -1665,7 +1913,7 @@ static void run_session(void) return; } gvar = g_variant_new_uint64(limit_samples); - if (sr_config_set(sdi, SR_CONF_LIMIT_SAMPLES, gvar) != SR_OK) { + if (sr_config_set(sdi, NULL, SR_CONF_LIMIT_SAMPLES, gvar) != SR_OK) { g_critical("Failed to configure sample limit."); sr_session_destroy(); return; @@ -1679,7 +1927,7 @@ static void run_session(void) return; } gvar = g_variant_new_uint64(limit_frames); - if (sr_config_set(sdi, SR_CONF_LIMIT_FRAMES, gvar) != SR_OK) { + if (sr_config_set(sdi, NULL, SR_CONF_LIMIT_FRAMES, gvar) != SR_OK) { g_critical("Failed to configure frame limit."); sr_session_destroy(); return; @@ -1700,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); @@ -1720,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; @@ -1754,15 +2009,36 @@ int main(int argc, char **argv) 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 @@ -1771,7 +2047,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) @@ -1785,8 +2061,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)