X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=sigrok-cli.c;h=39cbb777be2172d8e207607c418b9c367cfec887;hp=a1ab7362ce8cfceb7bba44dc0a4e601579c367eb;hb=a0e3651198ca9f75fcedf2ad7f7cdb66caab7f47;hpb=644bb1e88009546aadd919695d3dd602f06441d7 diff --git a/sigrok-cli.c b/sigrok-cli.c index a1ab736..39cbb77 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,18 +46,19 @@ 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; #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_triggers = NULL; static gchar *opt_pds = NULL; @@ -78,13 +79,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 +99,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, @@ -185,10 +186,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 +253,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 @@ -330,9 +336,11 @@ static void show_dev_detail(void) GSList *devices; 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,8 +351,8 @@ 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; } @@ -374,7 +382,7 @@ static void show_dev_detail(void) /* Driver supports no device instance options. */ return; - printf("Supported device options:\n"); + 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]))) @@ -422,9 +430,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)); @@ -481,34 +494,6 @@ 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); @@ -528,32 +513,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, + } 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; } - 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) { - /* TODO test */ - /* 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, srci->key, + &gvar_list, sdi) != SR_OK) { + printf("\n"); + continue; + } + + 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); } @@ -561,6 +592,7 @@ static void show_dev_detail(void) g_variant_unref(gvar_opts); sr_dev_close(sdi); + g_slist_free(devices); } @@ -668,7 +700,6 @@ 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; uint8_t *output_buf, *filter_out; @@ -720,6 +751,7 @@ 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) { @@ -729,7 +761,25 @@ static void datafeed_in(const struct sr_dev_inst *sdi, } samplerate = g_variant_get_uint64(gvar); g_variant_unref(gvar); - srd_session_start(logic_probelist->len, unitsize, samplerate); + if (srd_session_config_set(srd_sess, SRD_CONF_NUM_PROBES, + g_variant_new_uint64(logic_probelist->len)) != SRD_OK) { + g_critical("Failed to configure decode session."); + break; + } + if (srd_session_config_set(srd_sess, SRD_CONF_UNITSIZE, + g_variant_new_uint64(unitsize)) != SRD_OK) { + g_critical("Failed to configure decode session."); + break; + } + if (srd_session_config_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; + } } #endif break; @@ -798,8 +848,8 @@ 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) + if (srd_session_send(srd_sess, received_samples, + (uint8_t*)filter_out, filter_out_len) != SRD_OK) sr_session_stop(); #endif } else { @@ -913,7 +963,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."); @@ -946,7 +996,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); @@ -983,7 +1033,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))) @@ -1060,7 +1110,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; @@ -1116,7 +1166,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]); @@ -1127,14 +1177,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 @@ -1238,6 +1288,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 @@ -1442,9 +1499,9 @@ static int set_dev_options(struct sr_dev_inst *sdi, GHashTable *args) 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)) { @@ -1494,6 +1551,16 @@ 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; } @@ -1514,12 +1581,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())) { @@ -1615,8 +1682,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); @@ -1701,6 +1768,7 @@ static void run_session(void) if (opt_continuous) clear_anykey(); + sr_session_datafeed_callback_remove_all(); sr_session_destroy(); g_slist_free(devices); @@ -1725,16 +1793,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; @@ -1755,9 +1825,13 @@ int main(int argc, char **argv) if (opt_pds) { if (srd_init(NULL) != SRD_OK) goto done; + if (srd_session_new(&srd_sess) != SRD_OK) { + g_critical("Failed to create new decode session."); + goto done; + } if (register_pds(NULL, opt_pds) != 0) goto done; - if (srd_pd_output_callback_add(SRD_OUTPUT_ANN, + if (srd_pd_output_callback_add(srd_sess, SRD_OUTPUT_ANN, show_pd_annotations, NULL) != SRD_OK) goto done; if (setup_pd_stack() != 0) @@ -1772,7 +1846,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) @@ -1786,8 +1860,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)