X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=session.c;h=5e096cd32f39d5e7edc9be45a87f9d8e81ba8f50;hp=b045119483a8238b1091fd8bf2c42e1c4343e98d;hb=a663411b8f15f3933caa0629414cf5b994f299c4;hpb=5d7604d168152ce4c419928b20f0ccfeb669ebba
diff --git a/session.c b/session.c
index b045119..5e096cd 100644
--- a/session.c
+++ b/session.c
@@ -17,6 +17,7 @@
* along with this program. If not, see .
*/
+#include
#include
#include
#include
@@ -44,14 +45,15 @@ static int set_limit_time(const struct sr_dev_inst *sdi)
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)) {
+ } 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);
@@ -74,7 +76,7 @@ static int set_limit_time(const struct sr_dev_inst *sdi)
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;
@@ -104,6 +106,15 @@ const struct sr_output *setup_output_format(const struct sr_dev_inst *sdi)
fmtopts = NULL;
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);
@@ -174,17 +185,12 @@ void datafeed_in(const struct sr_dev_inst *sdi,
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, NULL);
- if (opt_output_file)
- outfile = g_fopen(opt_output_file, "wb");
- else
- outfile = stdout;
-
rcvd_samples_logic = rcvd_samples_analog = 0;
if (maybe_config_get(driver, sdi, NULL, SR_CONF_SAMPLERATE,
@@ -267,7 +273,7 @@ void datafeed_in(const struct sr_dev_inst *sdi,
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
}
@@ -299,7 +305,7 @@ 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
&& !opt_output_format
@@ -310,7 +316,7 @@ void datafeed_in(const struct sr_dev_inst *sdi,
*/
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);
}
@@ -350,16 +356,17 @@ 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;
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;
}
@@ -448,6 +455,33 @@ int opt_to_gvar(char *key, char *value, struct sr_config *src)
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);
@@ -493,11 +527,12 @@ void run_session(void)
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 *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) {
@@ -511,20 +546,18 @@ void run_session(void)
driver = sr_dev_inst_driver_get(sdi);
- if (sr_config_list(driver, sdi, NULL, SR_CONF_DEVICE_OPTIONS, &gvar) != SR_OK) {
+ if (!(dev_opts = sr_dev_options(driver, sdi, NULL))) {
g_critical("Failed to query list device 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 < dev_opts->len; i++) {
+ if (g_array_index(dev_opts, uint32_t, i) == SR_CONF_DEMO_DEV)
is_demo_dev = 1;
}
- g_variant_unref(gvar);
+ g_array_free(dev_opts, TRUE);
if (!is_demo_dev)
real_devices = g_slist_append(real_devices, sdi);
@@ -574,6 +607,7 @@ void run_session(void)
return;
}
+ trigger = NULL;
if (opt_triggers) {
if (!parse_triggerstring(sdi, opt_triggers, &trigger)) {
sr_session_destroy(session);
@@ -648,8 +682,14 @@ void run_session(void)
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;
}
@@ -657,12 +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);
-
}