#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;
-extern gchar *opt_output_file;
-extern gchar *opt_output_format;
-extern gchar *opt_pds;
-extern gboolean opt_wait_trigger;
-extern gchar *opt_time;
-extern gchar *opt_samples;
-extern gchar *opt_frames;
-extern gchar *opt_continuous;
-extern gchar *opt_config;
-extern gchar *opt_triggers;
#ifdef HAVE_SRD
extern struct srd_session *srd_sess;
#endif
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));
+ } 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;
const struct sr_datafeed_meta *meta;
const struct sr_datafeed_logic *logic;
const struct sr_datafeed_analog *analog;
+ 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;
int i;
char **channels;
- (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)
return;
+ session = cb_data;
switch (packet->type) {
case SR_DF_HEADER:
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) {
channels[i++] = ch->name;
}
channels[i] = NULL;
- sr_session_save_init(opt_output_file, samplerate,
- channels);
+ sr_session_save_init(session, opt_output_file,
+ samplerate, channels);
g_free(channels);
}
- save_chunk_logic(logic->data, input_len, logic->unitsize);
+ save_chunk_logic(session, logic->data, input_len, logic->unitsize);
} else {
if (opt_pds) {
#ifdef HAVE_SRD
if (srd_session_send(srd_sess, rcvd_samples_logic, end_sample,
logic->data, input_len) != SRD_OK)
- sr_session_stop();
+ sr_session_stop(session);
#endif
}
}
}
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 (opt_output_file && default_output_format)
/* Flush whatever is left out to the session file. */
- save_chunk_logic(NULL, 0, 0);
+ save_chunk_logic(session, NULL, 0, 0);
if (limit_samples) {
if (rcvd_samples_logic > 0 && rcvd_samples_logic < limit_samples)
GSList *devices;
GHashTable *devargs;
GVariant *gvar;
+ struct sr_session *session;
+ struct sr_trigger *trigger;
struct sr_dev_inst *sdi;
uint64_t min_samples, max_samples;
- int max_channels, i;
- char **triggerlist;
devices = device_scan();
if (!devices) {
}
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();
- sr_session_datafeed_callback_add(datafeed_in, NULL);
+ sr_session_new(&session);
+ sr_session_datafeed_callback_add(session, 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) {
+ if (sr_session_dev_add(session, sdi) != SR_OK) {
g_critical("Failed to add device to session.");
- sr_session_destroy();
+ sr_session_destroy(session);
return;
}
if (select_channels(sdi) != SR_OK) {
g_critical("Failed to set channels.");
- sr_session_destroy();
+ sr_session_destroy(session);
return;
}
if (opt_triggers) {
- if (!(triggerlist = sr_parse_triggerstring(sdi, opt_triggers))) {
- sr_session_destroy();
+ if (!parse_triggerstring(sdi, opt_triggers, &trigger)) {
+ sr_session_destroy(session);
return;
}
- max_channels = g_slist_length(sdi->channels);
- for (i = 0; i < max_channels; i++) {
- if (triggerlist[i]) {
- sr_dev_trigger_set(sdi, i, triggerlist[i]);
- g_free(triggerlist[i]);
- }
+ if (sr_session_trigger_set(session, trigger) != SR_OK) {
+ sr_session_destroy(session);
+ return;
}
- g_free(triggerlist);
}
if (opt_continuous) {
if (!sr_dev_has_option(sdi, SR_CONF_CONTINUOUS)) {
g_critical("This device does not support continuous sampling.");
- sr_session_destroy();
+ sr_session_destroy(session);
return;
}
}
if (opt_time) {
if (set_limit_time(sdi) != SR_OK) {
- sr_session_destroy();
+ sr_session_destroy(session);
return;
}
}
if (opt_samples) {
if ((sr_parse_sizestring(opt_samples, &limit_samples) != SR_OK)) {
g_critical("Invalid sample limit '%s'.", opt_samples);
- sr_session_destroy();
+ sr_session_destroy(session);
return;
}
if (sr_config_list(sdi->driver, sdi, NULL,
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();
+ sr_session_destroy(session);
return;
}
}
if (opt_frames) {
if ((sr_parse_sizestring(opt_frames, &limit_frames) != SR_OK)) {
g_critical("Invalid sample limit '%s'.", opt_samples);
- sr_session_destroy();
+ sr_session_destroy(session);
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();
+ sr_session_destroy(session);
return;
}
}
- if (sr_session_start() != SR_OK) {
+ if (sr_session_start(session) != SR_OK) {
g_critical("Failed to start session.");
- sr_session_destroy();
+ sr_session_destroy(session);
return;
}
if (opt_continuous)
- add_anykey();
+ add_anykey(session);
- sr_session_run();
+ sr_session_run(session);
if (opt_continuous)
clear_anykey();
- sr_session_datafeed_callback_remove_all();
- sr_session_destroy();
- g_slist_free(devices);
+ sr_session_datafeed_callback_remove_all(session);
+ sr_session_destroy(session);
}
-void save_chunk_logic(uint8_t *data, uint64_t data_len, int unitsize)
+void save_chunk_logic(struct sr_session *session, uint8_t *data,
+ uint64_t data_len, int unitsize)
{
static uint8_t *buf = NULL;
static int buf_len = 0;
if (!buf)
buf = g_malloc(SAVE_CHUNK_SIZE);
+ while (data_len > SAVE_CHUNK_SIZE) {
+ save_chunk_logic(session, data, SAVE_CHUNK_SIZE, unitsize);
+ data += SAVE_CHUNK_SIZE;
+ data_len -= SAVE_CHUNK_SIZE;
+ }
+
if (buf_len + data_len > SAVE_CHUNK_SIZE) {
max = (SAVE_CHUNK_SIZE - buf_len) / unitsize * unitsize;
memcpy(buf + buf_len, data, max);
- sr_session_append(opt_output_file, buf, unitsize,
+ sr_session_append(session, opt_output_file, buf, unitsize,
(buf_len + max) / unitsize);
memcpy(buf, data + max, data_len - max);
buf_len = data_len - max;
} else if (data_len == 0 && last_unitsize != 0) {
/* End of data, flush the buffer out. */
- sr_session_append(opt_output_file, buf, last_unitsize,
+ sr_session_append(session, opt_output_file, buf, last_unitsize,
buf_len / last_unitsize);
} else {
/* Buffer chunk. */
projects / sigrok-cli.git / blobdiff