X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=session.c;h=5e096cd32f39d5e7edc9be45a87f9d8e81ba8f50;hb=04044d1b73a53aa24c22d5a722e5ce2570fcdd74;hp=ab7e67488fdb519c431faa63dddf81351d338d6b;hpb=b61a8850b1396aecb59da1ff51f1c874b1cce01f;p=sigrok-cli.git
diff --git a/session.c b/session.c
index ab7e674..5e096cd 100644
--- a/session.c
+++ b/session.c
@@ -17,13 +17,13 @@
* along with this program. If not, see .
*/
-#include "sigrok-cli.h"
+#include
#include
#include
#include
#include
+#include "sigrok-cli.h"
-static int default_output_format = FALSE;
static uint64_t limit_samples = 0;
static uint64_t limit_frames = 0;
@@ -36,21 +36,26 @@ static int set_limit_time(const struct sr_dev_inst *sdi)
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;
@@ -71,55 +76,20 @@ static int set_limit_time(const struct sr_dev_inst *sdi)
return SR_OK;
}
-GHashTable *generic_arg_to_opt(const struct sr_option **opts, GHashTable *genargs)
-{
- 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[0]; opt; 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 if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE_DOUBLE)) {
- gvar = g_variant_new_double(strtod(s, NULL));
- g_hash_table_insert(hash, g_strdup(opt->id),
- g_variant_ref_sink(gvar));
- } else {
- g_critical("Don't know GVariant type for option '%s'!", opt->id);
- }
- }
-
- return hash;
-}
-
-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 **opts;
+ const struct sr_option **options;
const struct sr_output *o;
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);
@@ -127,14 +97,24 @@ const struct sr_output *setup_output_format(const struct sr_dev_inst *sdi)
if (!fmtspec)
g_critical("Invalid output format.");
if (!(omod = sr_output_find(fmtspec)))
- g_critical("Unknown output format '%s'.", fmtspec);
+ g_critical("Unknown output module '%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(opts);
+ if ((options = sr_output_options_get(omod))) {
+ fmtopts = generic_arg_to_opt(options, fmtargs);
+ sr_output_options_free(options);
} 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");
+ else
+ *outfile = NULL;
+ } else {
+ *outfile = stdout;
+ }
+
if (fmtopts)
g_hash_table_destroy(fmtopts);
g_hash_table_destroy(fmtargs);
@@ -142,6 +122,37 @@ const struct sr_output *setup_output_format(const struct sr_dev_inst *sdi)
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;
+
+ if (!opt_transform_module)
+ opt_transform_module = "nop";
+
+ fmtargs = parse_generic_arg(opt_transform_module, TRUE);
+ 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);
+ 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;
+}
+
void datafeed_in(const struct sr_dev_inst *sdi,
const struct sr_datafeed_packet *packet, void *cb_data)
{
@@ -150,7 +161,6 @@ void datafeed_in(const struct sr_dev_inst *sdi,
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;
@@ -163,37 +173,27 @@ void datafeed_in(const struct sr_dev_inst *sdi,
GVariant *gvar;
uint64_t end_sample;
uint64_t input_len;
- int i;
- char **channels;
+ struct sr_dev_driver *driver;
+
+ driver = sr_dev_inst_driver_get(sdi);
/* If the first packet to come in isn't a header, don't even try. */
- if (packet->type != SR_DF_HEADER && o == NULL)
+ if (packet->type != SR_DF_HEADER && !o)
return;
session = cb_data;
switch (packet->type) {
case SR_DF_HEADER:
g_debug("cli: Received SR_DF_HEADER.");
- if (!(o = setup_output_format(sdi)))
+ 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);
+ 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,
+ if (maybe_config_get(driver, sdi, NULL, SR_CONF_SAMPLERATE,
&gvar) == SR_OK) {
samplerate = g_variant_get_uint64(gvar);
g_variant_unref(gvar);
@@ -270,30 +270,12 @@ void datafeed_in(const struct sr_dev_inst *sdi,
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;
@@ -323,15 +305,18 @@ void datafeed_in(const struct sr_dev_inst *sdi,
break;
}
- if (o && outfile && !opt_pds) {
+ if (o && !opt_pds) {
if (sr_output_send(o, packet, &out) == SR_OK) {
- if (!out || (out->len == 0 && default_output_format
+ if (!out || (out->len == 0
+ && !opt_output_format
&& packet->type == SR_DF_ANALOG)) {
- /* The user didn't specify an output module,
- * but needs to see this analog data. */
+ /*
+ * 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);
}
@@ -340,8 +325,10 @@ void datafeed_in(const struct sr_dev_inst *sdi,
}
}
- /* 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.");
@@ -355,10 +342,6 @@ void datafeed_in(const struct sr_dev_inst *sdi,
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.",
@@ -373,20 +356,23 @@ void datafeed_in(const struct sr_dev_inst *sdi,
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;
@@ -454,10 +440,57 @@ int opt_to_gvar(char *key, char *value, struct sr_config *src)
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 / 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;
}
@@ -474,9 +507,10 @@ int set_dev_options(struct sr_dev_inst *sdi, GHashTable *args)
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;
}
}
@@ -486,28 +520,66 @@ int set_dev_options(struct sr_dev_inst *sdi, GHashTable *args)
void run_session(void)
{
- GSList *devices;
+ 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;
+ GArray *dev_opts;
+ guint i;
+ int is_demo_dev;
+ struct sr_dev_driver *driver;
+ const struct sr_transform *t;
+ GMainLoop *main_loop;
devices = device_scan();
if (!devices) {
g_critical("No devices found.");
return;
}
+
+ real_devices = NULL;
+ for (sd = devices; sd; sd = sd->next) {
+ sdi = sd->data;
+
+ driver = sr_dev_inst_driver_get(sdi);
+
+ if (!(dev_opts = sr_dev_options(driver, sdi, NULL))) {
+ g_critical("Failed to query list device options.");
+ return;
+ }
+
+ is_demo_dev = 0;
+ for (i = 0; i < dev_opts->len; i++) {
+ if (g_array_index(dev_opts, uint32_t, i) == SR_CONF_DEMO_DEV)
+ is_demo_dev = 1;
+ }
+
+ g_array_free(dev_opts, TRUE);
+
+ if (!is_demo_dev)
+ real_devices = g_slist_append(real_devices, sdi);
+ }
+
if (g_slist_length(devices) > 1) {
- g_critical("sigrok-cli only supports one device for capturing.");
- g_slist_free(devices);
- return;
+ if (g_slist_length(real_devices) != 1) {
+ g_critical("sigrok-cli only supports one device for capturing.");
+ return;
+ } else {
+ /* We only have one non-demo device. */
+ g_slist_free(devices);
+ devices = real_devices;
+ real_devices = NULL;
+ }
}
+
sdi = devices->data;
g_slist_free(devices);
+ g_slist_free(real_devices);
- sr_session_new(&session);
+ sr_session_new(sr_ctx, &session);
sr_session_datafeed_callback_add(session, datafeed_in, NULL);
if (sr_dev_open(sdi) != SR_OK) {
@@ -535,6 +607,7 @@ void run_session(void)
return;
}
+ trigger = NULL;
if (opt_triggers) {
if (!parse_triggerstring(sdi, opt_triggers, &trigger)) {
sr_session_destroy(session);
@@ -567,10 +640,12 @@ void run_session(void)
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) {
@@ -583,7 +658,7 @@ void run_session(void)
}
}
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;
@@ -597,15 +672,24 @@ void run_session(void)
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 (!(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;
}
@@ -613,49 +697,15 @@ void run_session(void)
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;
-
}