#include <string.h>
#include <stdlib.h>
-static struct sr_output_format *output_format = NULL;
static int default_output_format = FALSE;
static uint64_t limit_samples = 0;
static uint64_t limit_frames = 0;
return SR_OK;
}
-struct sr_output *setup_output_format(const struct sr_dev_inst *sdi)
+GHashTable *generic_arg_to_opt(const struct sr_option *opts, GHashTable *genargs)
{
- GHashTable *fmtargs;
- struct sr_output *o;
- struct sr_output_format **outputs;
- int i;
+ GHashTable *hash;
+ GVariant *gvar;
+ const struct sr_option *opt;
+ char *s;
+
+ hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
+ (GDestroyNotify)g_variant_unref);
+ for (opt = opts; opt->id && opt->def; opt++) {
+ if (!(s = g_hash_table_lookup(genargs, opt->id)))
+ continue;
+ if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE_UINT32)) {
+ gvar = g_variant_new_uint32(strtoul(s, NULL, 10));
+ g_hash_table_insert(hash, g_strdup(opt->id),
+ g_variant_ref_sink(gvar));
+ printf("opt %s value %s\n", opt->id, s);
+ } else {
+ g_critical("Don't know how to convert option '%s' to %s!",
+ opt->id, g_variant_get_type_string(opt->def));
+ }
+ }
+
+ return hash;
+}
+
+const struct sr_output *setup_output_format(const struct sr_dev_inst *sdi)
+{
+ const struct sr_output_module *omod;
+ const struct sr_option *opts;
+ const struct sr_output *o;
+ GHashTable *fmtargs, *fmtopts;
char *fmtspec;
if (opt_output_format && !strcmp(opt_output_format, "sigrok")) {
fmtspec = g_hash_table_lookup(fmtargs, "sigrok_key");
if (!fmtspec)
g_critical("Invalid output format.");
- outputs = sr_output_list();
- for (i = 0; outputs[i]; i++) {
- if (strcmp(outputs[i]->id, fmtspec))
- continue;
- g_hash_table_remove(fmtargs, "sigrok_key");
- output_format = outputs[i];
- break;
- }
- if (!output_format)
- g_critical("Invalid output format '%s'.", opt_output_format);
- o = sr_output_new(output_format, fmtargs, sdi);
+ if (!(omod = sr_output_find(fmtspec)))
+ g_critical("Unknown output format '%s'.", fmtspec);
+ g_hash_table_remove(fmtargs, "sigrok_key");
+ if ((opts = sr_output_options_get(omod))) {
+ fmtopts = generic_arg_to_opt(opts, fmtargs);
+ sr_output_options_free(omod);
+ } else
+ fmtopts = NULL;
+ o = sr_output_new(omod, fmtopts, sdi);
+ if (fmtopts)
+ g_hash_table_destroy(fmtopts);
g_hash_table_destroy(fmtargs);
return o;
struct sr_session *session;
struct sr_config *src;
struct sr_channel *ch;
- static struct sr_output *o = NULL;
+ static const struct sr_output *o = NULL;
+ static const struct sr_output *oa = NULL;
static uint64_t rcvd_samples_logic = 0;
static uint64_t rcvd_samples_analog = 0;
static uint64_t samplerate = 0;
g_debug("cli: Received SR_DF_HEADER.");
o = setup_output_format(sdi);
+ /* Set up backup analog output module. */
+ oa = sr_output_new(sr_output_find("analog"), NULL, sdi);
+
/* Prepare non-stdout output. */
outfile = stdout;
if (opt_output_file) {
}
if (o && outfile && !opt_pds) {
- if (sr_output_send(o, packet, &out) == SR_OK && out) {
- fwrite(out->str, 1, out->len, outfile);
- fflush(outfile);
- g_string_free(out, TRUE);
+ if (sr_output_send(o, packet, &out) == SR_OK) {
+ if (!out || (out->len == 0 && default_output_format
+ && packet->type == SR_DF_ANALOG)) {
+ /* The user didn't specify an output module,
+ * but needs to see this analog data. */
+ sr_output_send(oa, packet, &out);
+ }
+ if (out && out->len > 0) {
+ fwrite(out->str, 1, out->len, outfile);
+ fflush(outfile);
+ }
+ if (out)
+ g_string_free(out, TRUE);
}
}
sr_output_free(o);
o = NULL;
+ sr_output_free(oa);
+ oa = NULL;
+
if (outfile && outfile != stdout)
fclose(outfile);
}
if (g_slist_length(devices) > 1) {
g_critical("sigrok-cli only supports one device for capturing.");
+ g_slist_free(devices);
return;
}
sdi = devices->data;
+ g_slist_free(devices);
sr_session_new(&session);
sr_session_datafeed_callback_add(session, datafeed_in, NULL);
sr_session_datafeed_callback_remove_all(session);
sr_session_destroy(session);
- g_slist_free(devices);
}