* 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 uint64_t limit_samples = 0;
static uint64_t limit_frames = 0;
-static char *srzip_and_filename = NULL;
#ifdef HAVE_SRD
extern struct srd_session *srd_sess;
return SR_ERR;
}
- if (config_key_has_cap(driver, sdi, NULL, SR_CONF_LIMIT_MSEC, SR_CONF_SET)) {
+ 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 (config_key_has_cap(driver, sdi, NULL, SR_CONF_SAMPLERATE,
- SR_CONF_GET | SR_CONF_SET)) {
- /* Convert to samples based on the samplerate. */
+ } 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);
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;
const struct sr_output *o;
GHashTable *fmtargs, *fmtopts;
- int size;
char *fmtspec;
if (!opt_output_format) {
if (opt_output_file) {
- size = strlen(opt_output_file) + 32;
- srzip_and_filename = g_malloc(size);
- snprintf(srzip_and_filename, size, "srzip:filename=%s", opt_output_file);
- opt_output_format = srzip_and_filename;
+ opt_output_format = DEFAULT_OUTPUT_FORMAT_FILE;
} else {
- opt_output_format = DEFAULT_OUTPUT_FORMAT;
+ opt_output_format = DEFAULT_OUTPUT_FORMAT_NOFILE;
}
}
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);
const struct sr_option **options;
const struct sr_transform *t;
GHashTable *fmtargs, *fmtopts;
- int size;
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)
uint64_t input_len;
struct sr_dev_driver *driver;
+ /* Avoid warnings when building without decoder support. */
+ (void)session;
+ (void)input_len;
+
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);
-
- if (opt_output_file)
- outfile = g_fopen(opt_output_file, "wb");
- else
- outfile = stdout;
+ if (outfile)
+ oa = sr_output_new(sr_output_find("analog"), NULL,
+ sdi, NULL);
rcvd_samples_logic = rcvd_samples_analog = 0;
if (opt_pds) {
#ifdef HAVE_SRD
if (srd_session_send(srd_sess, rcvd_samples_logic, end_sample,
- logic->data, input_len) != SRD_OK)
+ logic->data, input_len, logic->unitsize) != SRD_OK)
sr_session_stop(session);
#endif
}
break;
}
- if (o && outfile && !opt_pds) {
+ if (o && !opt_pds) {
if (sr_output_send(o, packet, &out) == SR_OK) {
- 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. */
+ 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 (o) {
+ if (o)
sr_output_free(o);
- if (srzip_and_filename)
- g_free(srzip_and_filename);
- }
o = NULL;
- sr_output_free(oa);
+ if (oa)
+ sr_output_free(oa);
oa = NULL;
if (outfile && outfile != stdout)
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;
gchar **keyval;
- int ret;
+ 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 || strlen(value) == 0) &&
+ if ((!value || strlen(value) == 0) &&
(srci->datatype != SR_T_BOOL)) {
g_critical("Option '%s' needs a value.", (char *)key);
return -1;
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);
cg = select_channel_group(sdi);
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'.", (char *)key);
+ g_critical("Failed to set device option '%s': %s.",
+ (char *)key, sr_strerror(ret));
return ret;
}
}
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;
devices = device_scan();
if (!devices) {
driver = sr_dev_inst_driver_get(sdi);
- if (sr_config_list(driver, sdi, NULL, SR_CONF_DEVICE_OPTIONS, &gvar) != SR_OK) {
- g_critical("Failed to query list device options.");
+ 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);
+ sr_session_datafeed_callback_add(session, datafeed_in, session);
if (sr_dev_open(sdi) != SR_OK) {
g_critical("Failed to open device.");
return;
}
+ trigger = NULL;
if (opt_triggers) {
if (!parse_triggerstring(sdi, opt_triggers, &trigger)) {
sr_session_destroy(session);
}
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. */
+ /*
+ * 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) {
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;
}
}
}
- if (!(t = setup_transform_module(sdi)))
- g_critical("Failed to initialize transform module.");
+ 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);
-
}
-