* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "sigrok-cli.h"
+#include <config.h>
#include <glib.h>
#include <glib/gstdio.h>
#include <string.h>
#include <stdlib.h>
+#include "sigrok-cli.h"
-static int default_output_format = FALSE;
static uint64_t limit_samples = 0;
static uint64_t limit_frames = 0;
GVariant *gvar;
uint64_t time_msec;
uint64_t samplerate;
+ struct sr_dev_driver *driver;
+
+ driver = sr_dev_inst_driver_get(sdi);
if (!(time_msec = sr_parse_timestring(opt_time))) {
g_critical("Invalid time '%s'", opt_time);
return SR_ERR;
}
- if (sr_dev_has_option(sdi, SR_CONF_LIMIT_MSEC)) {
+ if (sr_dev_config_capabilities_list(sdi, NULL, SR_CONF_LIMIT_MSEC)
+ & SR_CONF_SET) {
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.");
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, sdi, NULL, SR_CONF_SAMPLERATE, &gvar);
+ } else if (sr_dev_config_capabilities_list(sdi, NULL, SR_CONF_SAMPLERATE)
+ & (SR_CONF_GET | SR_CONF_SET)) {
+ /* Convert to samples based on the samplerate. */
+ sr_config_get(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;
return SR_OK;
}
-const struct sr_output *setup_output_format(const struct sr_dev_inst *sdi)
+const struct sr_output *setup_output_format(const struct sr_dev_inst *sdi, FILE **outfile)
{
const struct sr_output_module *omod;
const struct sr_option **options;
GHashTable *fmtargs, *fmtopts;
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
- * later, sigrok session format will be used.
- */
- default_output_format = TRUE;
+ if (opt_output_file) {
+ opt_output_format = DEFAULT_OUTPUT_FORMAT_FILE;
+ } else {
+ opt_output_format = DEFAULT_OUTPUT_FORMAT_NOFILE;
+ }
}
- fmtargs = parse_generic_arg(opt_output_format, TRUE);
+ fmtargs = parse_generic_arg(opt_output_format, TRUE, NULL);
fmtspec = g_hash_table_lookup(fmtargs, "sigrok_key");
if (!fmtspec)
g_critical("Invalid output format.");
g_hash_table_remove(fmtargs, "sigrok_key");
if ((options = sr_output_options_get(omod))) {
fmtopts = generic_arg_to_opt(options, fmtargs);
+ (void)warn_unknown_keys(options, fmtargs, NULL);
sr_output_options_free(options);
- } else
+ } else {
fmtopts = NULL;
- o = sr_output_new(omod, fmtopts, sdi);
+ }
+ o = sr_output_new(omod, fmtopts, sdi, opt_output_file);
+
+ if (opt_output_file) {
+ if (!sr_output_test_flag(omod, SR_OUTPUT_INTERNAL_IO_HANDLING)) {
+ *outfile = g_fopen(opt_output_file, "wb");
+ if (!*outfile) {
+ g_critical("Cannot write to output file '%s'.",
+ opt_output_file);
+ }
+ } else {
+ *outfile = NULL;
+ }
+ } else {
+ setup_binary_stdout();
+ *outfile = stdout;
+ }
+
if (fmtopts)
g_hash_table_destroy(fmtopts);
g_hash_table_destroy(fmtargs);
return o;
}
+const struct sr_transform *setup_transform_module(const struct sr_dev_inst *sdi)
+{
+ const struct sr_transform_module *tmod;
+ const struct sr_option **options;
+ const struct sr_transform *t;
+ GHashTable *fmtargs, *fmtopts;
+ char *fmtspec;
+
+ fmtargs = parse_generic_arg(opt_transform_module, TRUE, NULL);
+ fmtspec = g_hash_table_lookup(fmtargs, "sigrok_key");
+ if (!fmtspec)
+ g_critical("Invalid transform module.");
+ if (!(tmod = sr_transform_find(fmtspec)))
+ g_critical("Unknown transform module '%s'.", fmtspec);
+ g_hash_table_remove(fmtargs, "sigrok_key");
+ if ((options = sr_transform_options_get(tmod))) {
+ fmtopts = generic_arg_to_opt(options, fmtargs);
+ (void)warn_unknown_keys(options, fmtargs, NULL);
+ sr_transform_options_free(options);
+ } else {
+ fmtopts = NULL;
+ }
+ t = sr_transform_new(tmod, fmtopts, sdi);
+ if (fmtopts)
+ g_hash_table_destroy(fmtopts);
+ g_hash_table_destroy(fmtargs);
+
+ return t;
+}
+
+/* Get the input stream's list of channels and their types, once. */
+static void props_get_channels(struct df_arg_desc *args,
+ const struct sr_dev_inst *sdi)
+{
+ struct input_stream_props *props;
+ GSList *l;
+ const struct sr_channel *ch;
+
+ if (!args)
+ return;
+ props = &args->props;
+ if (props->channels)
+ return;
+
+ props->channels = g_slist_copy(sr_dev_inst_channels_get(sdi));
+ if (!props->channels)
+ return;
+ for (l = props->channels; l; l = l->next) {
+ ch = l->data;
+ if (!ch->enabled)
+ continue;
+ if (ch->type != SR_CHANNEL_ANALOG)
+ continue;
+ props->first_analog_channel = ch;
+ break;
+ }
+}
+
+static gboolean props_chk_1st_channel(struct df_arg_desc *args,
+ const struct sr_datafeed_analog *analog)
+{
+ struct sr_channel *ch;
+
+ if (!args || !analog || !analog->meaning)
+ return FALSE;
+ ch = g_slist_nth_data(analog->meaning->channels, 0);
+ if (!ch)
+ return FALSE;
+ return ch == args->props.first_analog_channel;
+}
+
+static void props_dump_details(struct df_arg_desc *args)
+{
+ struct input_stream_props *props;
+ size_t ch_count;
+ GSList *l;
+ const struct sr_channel *ch;
+ const char *type;
+
+ if (!args)
+ return;
+ props = &args->props;
+ if (props->samplerate)
+ printf("Samplerate: %" PRIu64 "\n", props->samplerate);
+ if (props->channels) {
+ ch_count = g_slist_length(props->channels);
+ printf("Channels: %zu\n", ch_count);
+ for (l = props->channels; l; l = l->next) {
+ ch = l->data;
+ if (ch->type == SR_CHANNEL_ANALOG)
+ type = "analog";
+ else
+ type = "logic";
+ printf("- %s: %s\n", ch->name, type);
+ }
+ }
+ if (props->unitsize)
+ printf("Logic unitsize: %zu\n", props->unitsize);
+ if (props->sample_count_logic)
+ printf("Logic sample count: %" PRIu64 "\n", props->sample_count_logic);
+ if (props->sample_count_analog)
+ printf("Analog sample count: %" PRIu64 "\n", props->sample_count_analog);
+ if (props->frame_count)
+ printf("Frame count: %" PRIu64 "\n", props->frame_count);
+ if (props->triggered)
+ printf("Trigger count: %" PRIu64 "\n", props->triggered);
+}
+
+static void props_cleanup(struct df_arg_desc *args)
+{
+ struct input_stream_props *props;
+
+ if (!args)
+ return;
+ props = &args->props;
+ g_slist_free(props->channels);
+ props->channels = NULL;
+ props->first_analog_channel = NULL;
+}
+
void datafeed_in(const struct sr_dev_inst *sdi,
const struct sr_datafeed_packet *packet, void *cb_data)
{
- 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 const struct sr_output *o = NULL;
static const struct sr_output *oa = NULL;
static uint64_t rcvd_samples_logic = 0;
static uint64_t samplerate = 0;
static int triggered = 0;
static FILE *outfile = NULL;
+
+ const struct sr_datafeed_meta *meta;
+ const struct sr_datafeed_logic *logic;
+ const struct sr_datafeed_analog *analog;
+ struct df_arg_desc *df_arg;
+ int do_props;
+ struct input_stream_props *props;
+ struct sr_session *session;
+ struct sr_config *src;
GSList *l;
GString *out;
GVariant *gvar;
uint64_t end_sample;
uint64_t input_len;
- int i;
- char **channels;
+ struct sr_dev_driver *driver;
- /* If the first packet to come in isn't a header, don't even try. */
- if (packet->type != SR_DF_HEADER && o == NULL)
+ /* Avoid warnings when building without decoder support. */
+ (void)session;
+ (void)input_len;
+
+ driver = sr_dev_inst_driver_get(sdi);
+
+ /* Skip all packets before the first header. */
+ if (packet->type != SR_DF_HEADER && !o)
return;
- session = cb_data;
+ /* Prepare to either process data, or "just" gather properties. */
+ df_arg = cb_data;
+ session = df_arg->session;
+ do_props = df_arg->do_props;
+ props = &df_arg->props;
+
switch (packet->type) {
case SR_DF_HEADER:
g_debug("cli: Received SR_DF_HEADER.");
- if (!(o = setup_output_format(sdi)))
+ if (maybe_config_get(driver, sdi, NULL, SR_CONF_SAMPLERATE,
+ &gvar) == SR_OK) {
+ samplerate = g_variant_get_uint64(gvar);
+ g_variant_unref(gvar);
+ }
+ if (do_props) {
+ /* Setup variables for maximum code path re-use. */
+ o = (void *)-1;
+ limit_samples = 0;
+ /* Start collecting input stream properties. */
+ memset(props, 0, sizeof(*props));
+ props->samplerate = samplerate;
+ props_get_channels(df_arg, sdi);
+ break;
+ }
+ if (!(o = setup_output_format(sdi, &outfile)))
g_critical("Failed to initialize output module.");
/* Set up backup analog output module. */
- oa = sr_output_new(sr_output_find("analog"), NULL, sdi);
+ if (outfile)
+ oa = sr_output_new(sr_output_find("analog"), NULL,
+ sdi, NULL);
- /* Prepare non-stdout output. */
- outfile = stdout;
- if (opt_output_file) {
- if (default_output_format) {
- outfile = NULL;
- } else {
- /* saving to a file in whatever format was set
- * with --format, so all we need is a filehandle */
- outfile = g_fopen(opt_output_file, "wb");
- }
- }
rcvd_samples_logic = rcvd_samples_analog = 0;
- if (sr_config_get(sdi->driver, sdi, NULL, SR_CONF_SAMPLERATE,
- &gvar) == SR_OK) {
- samplerate = g_variant_get_uint64(gvar);
- g_variant_unref(gvar);
- }
-
#ifdef HAVE_SRD
if (opt_pds) {
if (samplerate) {
g_critical("Failed to configure decode session.");
break;
}
+ pd_samplerate = samplerate;
}
if (srd_session_start(srd_sess) != SRD_OK) {
g_critical("Failed to start decode session.");
case SR_CONF_SAMPLERATE:
samplerate = g_variant_get_uint64(src->data);
g_debug("cli: Got samplerate %"PRIu64" Hz.", samplerate);
+ if (do_props) {
+ props->samplerate = samplerate;
+ break;
+ }
#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.");
}
+ pd_samplerate = samplerate;
}
#endif
break;
case SR_CONF_SAMPLE_INTERVAL:
samplerate = g_variant_get_uint64(src->data);
g_debug("cli: Got sample interval %"PRIu64" ms.", samplerate);
+ if (do_props) {
+ props->samplerate = samplerate;
+ break;
+ }
break;
default:
/* Unknown metadata is not an error. */
case SR_DF_TRIGGER:
g_debug("cli: Received SR_DF_TRIGGER.");
+ if (do_props) {
+ props->triggered++;
+ break;
+ }
triggered = 1;
break;
if (logic->length == 0)
break;
+ if (do_props) {
+ props_get_channels(df_arg, sdi);
+ props->unitsize = logic->unitsize;
+ props->sample_count_logic += logic->length / logic->unitsize;
+ break;
+ }
+
/* Don't store any samples until triggered. */
if (opt_wait_trigger && !triggered)
break;
end_sample = limit_samples;
input_len = (end_sample - rcvd_samples_logic) * logic->unitsize;
- if (opt_output_file && default_output_format) {
- /* Saving to a session file. */
- if (rcvd_samples_logic == 0) {
- /* First packet with logic data, init session file. */
- channels = g_malloc(sizeof(char *) * g_slist_length(sdi->channels));
- for (i = 0, l = sdi->channels; l; l = l->next) {
- ch = l->data;
- if (ch->enabled && ch->type == SR_CHANNEL_LOGIC)
- channels[i++] = ch->name;
- }
- channels[i] = NULL;
- sr_session_save_init(session, opt_output_file,
- samplerate, channels);
- g_free(channels);
- }
- save_chunk_logic(session, logic->data, input_len, logic->unitsize);
- } else {
- if (opt_pds) {
+ 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(session);
+ if (srd_session_send(srd_sess, rcvd_samples_logic, end_sample,
+ logic->data, input_len, logic->unitsize) != SRD_OK)
+ sr_session_stop(session);
#endif
- }
}
rcvd_samples_logic = end_sample;
if (analog->num_samples == 0)
break;
+ if (do_props) {
+ /* Only count the first analog channel. */
+ props_get_channels(df_arg, sdi);
+ if (!props_chk_1st_channel(df_arg, analog))
+ break;
+ props->sample_count_analog += analog->num_samples;
+ break;
+ }
+
if (limit_samples && rcvd_samples_analog >= limit_samples)
break;
case SR_DF_FRAME_END:
g_debug("cli: Received SR_DF_FRAME_END.");
+ if (do_props) {
+ props->frame_count++;
+ break;
+ }
break;
default:
break;
}
- if (o && outfile && !opt_pds) {
+ if (!do_props && o && !opt_pds) {
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. */
+ if (oa && !out) {
+ /*
+ * 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) {
+ if (outfile && out && out->len > 0) {
fwrite(out->str, 1, out->len, outfile);
fflush(outfile);
}
}
}
- /* SR_DF_END needs to be handled after the output module's receive()
- * is called, so it can properly clean up that module. */
+ /*
+ * SR_DF_END needs to be handled after the output module's receive()
+ * is called, so it can properly clean up that module.
+ */
if (packet->type == SR_DF_END) {
g_debug("cli: Received SR_DF_END.");
+#if defined HAVE_SRD_SESSION_SEND_EOF && HAVE_SRD_SESSION_SEND_EOF
+ (void)srd_session_send_eof(srd_sess);
+#endif
+
+ if (do_props) {
+ props_dump_details(df_arg);
+ props_cleanup(df_arg);
+ o = NULL;
+ }
+
if (o)
sr_output_free(o);
o = NULL;
- sr_output_free(oa);
+ if (oa)
+ 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(session, NULL, 0, 0);
-
if (limit_samples) {
if (rcvd_samples_logic > 0 && rcvd_samples_logic < limit_samples)
g_warning("Device only sent %" PRIu64 " samples.",
int opt_to_gvar(char *key, char *value, struct sr_config *src)
{
- const struct sr_config_info *srci;
+ const struct sr_key_info *srci, *srmqi;
double tmp_double, dlow, dhigh;
- uint64_t tmp_u64, p, q, low, high;
- GVariant *rational[2], *range[2];
+ uint64_t tmp_u64, p, q, low, high, mqflags;
+ uint32_t mq;
+ GVariant *rational[2], *range[2], *gtup[2];
+ GVariantBuilder *vbl;
gboolean tmp_bool;
- int ret;
+ gchar **keyval;
+ int ret, i;
- if (!(srci = sr_config_info_name_get(key))) {
+ if (!(srci = sr_key_info_name_get(SR_KEY_CONFIG, key))) {
g_critical("Unknown device option '%s'.", (char *) key);
return -1;
}
src->key = srci->key;
- if ((value == NULL) &&
+ if ((!value || strlen(value) == 0) &&
(srci->datatype != SR_T_BOOL)) {
g_critical("Option '%s' needs a value.", (char *)key);
return -1;
src->data = g_variant_new_tuple(range, 2);
}
break;
+ case SR_T_KEYVALUE:
+ /* Expects the argument to be in the form of key=value. */
+ keyval = g_strsplit(value, "=", 2);
+ if (!keyval[0] || !keyval[1]) {
+ g_strfreev(keyval);
+ ret = -1;
+ break;
+ } else {
+ vbl = g_variant_builder_new(G_VARIANT_TYPE_DICTIONARY);
+ g_variant_builder_add(vbl, "{ss}",
+ keyval[0], keyval[1]);
+ src->data = g_variant_builder_end(vbl);
+ g_strfreev(keyval);
+ }
+ break;
+ case SR_T_MQ:
+ /*
+ Argument is MQ id e.g. ("voltage") optionally followed by one
+ or more /<mqflag> e.g. "/ac".
+ */
+ keyval = g_strsplit(value, "/", 0);
+ if (!keyval[0] || !(srmqi = sr_key_info_name_get(SR_KEY_MQ, keyval[0]))) {
+ g_strfreev(keyval);
+ ret = -1;
+ break;
+ }
+ mq = srmqi->key;
+ mqflags = 0;
+ for (i = 1; keyval[i]; i++) {
+ if (!(srmqi = sr_key_info_name_get(SR_KEY_MQFLAGS, keyval[i]))) {
+ ret = -1;
+ break;
+ }
+ mqflags |= srmqi->key;
+ }
+ g_strfreev(keyval);
+ if (ret != -1) {
+ gtup[0] = g_variant_new_uint32(mq);
+ gtup[1] = g_variant_new_uint64(mqflags);
+ src->data = g_variant_new_tuple(gtup, 2);
+ }
+ break;
default:
+ g_critical("Unknown data type specified for option '%s' "
+ "(driver implementation bug?).", key);
ret = -1;
}
+ if (ret < 0)
+ g_critical("Invalid value: '%s' for option '%s'", value, key);
+
return ret;
}
+int set_dev_options_array(struct sr_dev_inst *sdi, char **opts)
+{
+ size_t opt_idx;
+ const char *opt_text;
+ GHashTable *args;
+ int ret;
+
+ for (opt_idx = 0; opts && opts[opt_idx]; opt_idx++) {
+ opt_text = opts[opt_idx];
+ args = parse_generic_arg(opt_text, FALSE, "channel_group");
+ if (!args)
+ continue;
+ ret = set_dev_options(sdi, args);
+ g_hash_table_destroy(args);
+ if (ret != SR_OK)
+ return ret;
+ }
+
+ return SR_OK;
+}
+
int set_dev_options(struct sr_dev_inst *sdi, GHashTable *args)
{
struct sr_config src;
+ const char *cg_name;
struct sr_channel_group *cg;
GHashTableIter iter;
gpointer key, value;
int ret;
+ /*
+ * Not finding the 'sigrok_key' key (optional user specified
+ * channel group name) in the current options group's hash table
+ * is perfectly fine. In that case the -g selection is used,
+ * which defaults to "the device" (global parameters).
+ */
+ cg_name = g_hash_table_lookup(args, "sigrok_key");
+ cg = lookup_channel_group(sdi, cg_name);
+
g_hash_table_iter_init(&iter, args);
while (g_hash_table_iter_next(&iter, &key, &value)) {
+ if (g_ascii_strcasecmp(key, "sigrok_key") == 0)
+ continue;
if ((ret = opt_to_gvar(key, value, &src)) != 0)
return ret;
- cg = select_channel_group(sdi);
- ret = sr_config_set(sdi, cg, src.key, src.data);
- if (ret != SR_OK) {
- g_critical("Failed to set device option '%s'.", (char *)key);
+ if ((ret = maybe_config_set(sr_dev_inst_driver_get(sdi), sdi, cg,
+ src.key, src.data)) != SR_OK) {
+ g_critical("Failed to set device option '%s': %s.",
+ (char *)key, sr_strerror(ret));
return ret;
}
}
void run_session(void)
{
+ struct df_arg_desc df_arg;
GSList *devices, *real_devices, *sd;
- GHashTable *devargs;
GVariant *gvar;
struct sr_session *session;
struct sr_trigger *trigger;
struct sr_dev_inst *sdi;
uint64_t min_samples, max_samples;
- gsize n_elements, i;
- const uint32_t *dev_opts;
+ GArray *drv_opts;
+ guint i;
int is_demo_dev;
+ struct sr_dev_driver *driver;
+ const struct sr_transform *t;
+ GMainLoop *main_loop;
+
+ memset(&df_arg, 0, sizeof(df_arg));
+ df_arg.do_props = FALSE;
devices = device_scan();
if (!devices) {
for (sd = devices; sd; sd = sd->next) {
sdi = sd->data;
- if (sr_config_list(sdi->driver, sdi, NULL, SR_CONF_DEVICE_OPTIONS, &gvar) != SR_OK) {
- g_critical("Failed to query sr_config_list(SR_CONF_DEVICE_OPTIONS).");
+ driver = sr_dev_inst_driver_get(sdi);
+
+ if (!(drv_opts = sr_dev_options(driver, NULL, NULL))) {
+ g_critical("Failed to query list of driver options.");
return;
}
- dev_opts = g_variant_get_fixed_array(gvar, &n_elements, sizeof(uint32_t));
-
is_demo_dev = 0;
- for (i = 0; i < n_elements; i++) {
- if (dev_opts[i] == SR_CONF_DEMO_DEV)
+ for (i = 0; i < drv_opts->len; i++) {
+ if (g_array_index(drv_opts, uint32_t, i) == SR_CONF_DEMO_DEV)
is_demo_dev = 1;
}
- g_variant_unref(gvar);
+ g_array_free(drv_opts, TRUE);
if (!is_demo_dev)
real_devices = g_slist_append(real_devices, sdi);
}
}
+ /* This is unlikely to happen but it makes static analyzers stop complaining. */
+ if (!devices) {
+ g_critical("No real devices found.");
+ return;
+ }
+
sdi = devices->data;
g_slist_free(devices);
g_slist_free(real_devices);
- sr_session_new(&session);
- sr_session_datafeed_callback_add(session, datafeed_in, NULL);
+ sr_session_new(sr_ctx, &session);
+ df_arg.session = session;
+ sr_session_datafeed_callback_add(session, datafeed_in, &df_arg);
+ df_arg.session = NULL;
if (sr_dev_open(sdi) != SR_OK) {
g_critical("Failed to open device.");
return;
}
- 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);
- }
+ if (opt_configs) {
+ if (set_dev_options_array(sdi, opt_configs) != SR_OK)
+ return;
}
if (select_channels(sdi) != SR_OK) {
return;
}
+ trigger = NULL;
if (opt_triggers) {
if (!parse_triggerstring(sdi, opt_triggers, &trigger)) {
sr_session_destroy(session);
sr_session_destroy(session);
return;
}
- if (sr_config_list(sdi->driver, sdi, NULL,
- SR_CONF_LIMIT_SAMPLES, &gvar) == SR_OK) {
- /* The device has no compression, or compression is turned
- * off, and publishes its sample memory size. */
+ if (maybe_config_list(driver, sdi, NULL, SR_CONF_LIMIT_SAMPLES,
+ &gvar) == SR_OK) {
+ /*
+ * The device has no compression, or compression is turned
+ * off, and publishes its sample memory size.
+ */
g_variant_get(gvar, "(tt)", &min_samples, &max_samples);
g_variant_unref(gvar);
if (limit_samples < min_samples) {
}
}
gvar = g_variant_new_uint64(limit_samples);
- if (sr_config_set(sdi, NULL, SR_CONF_LIMIT_SAMPLES, gvar) != SR_OK) {
+ if (maybe_config_set(sr_dev_inst_driver_get(sdi), sdi, NULL, SR_CONF_LIMIT_SAMPLES, gvar) != SR_OK) {
g_critical("Failed to configure sample limit.");
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);
+ g_critical("Invalid frame limit '%s'.", opt_frames);
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) {
+ if (maybe_config_set(sr_dev_inst_driver_get(sdi), sdi, NULL, SR_CONF_LIMIT_FRAMES, gvar) != SR_OK) {
g_critical("Failed to configure frame limit.");
sr_session_destroy(session);
return;
}
}
+ if (opt_transform_module) {
+ if (!(t = setup_transform_module(sdi)))
+ g_critical("Failed to initialize transform module.");
+ }
+
+ main_loop = g_main_loop_new(NULL, FALSE);
+
+ sr_session_stopped_callback_set(session,
+ (sr_session_stopped_callback)g_main_loop_quit, main_loop);
+
if (sr_session_start(session) != SR_OK) {
g_critical("Failed to start session.");
+ g_main_loop_unref(main_loop);
sr_session_destroy(session);
return;
}
if (opt_continuous)
add_anykey(session);
- sr_session_run(session);
+ g_main_loop_run(main_loop);
if (opt_continuous)
clear_anykey();
+ if (trigger)
+ sr_trigger_free(trigger);
+
sr_session_datafeed_callback_remove_all(session);
+ g_main_loop_unref(main_loop);
sr_session_destroy(session);
-
-}
-
-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;
- static int last_unitsize = 0;
- int max;
-
- 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(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(session, opt_output_file, buf, last_unitsize,
- buf_len / last_unitsize);
- } else {
- /* Buffer chunk. */
- memcpy(buf + buf_len, data, data_len);
- buf_len += data_len;
- }
- last_unitsize = unitsize;
-
}