X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session.c;h=6f402056c0eadfdac17b4ad829bf191aa2bdbf5e;hb=2620358aec3debcf4db81709927e8bb787d08b9b;hp=f51bb642aad35149972029991210d906ed3e26f8;hpb=cbbea0871ba979786ea00f0cf9ed4abe3cc0b857;p=sigrok-cli.git
diff --git a/session.c b/session.c
index f51bb64..6f40205 100644
--- a/session.c
+++ b/session.c
@@ -17,6 +17,7 @@
* along with this program. If not, see .
*/
+#include
#include
#include
#include
@@ -354,16 +355,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;
}
@@ -452,6 +454,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);
@@ -578,6 +607,7 @@ void run_session(void)
return;
}
+ trigger = NULL;
if (opt_triggers) {
if (!parse_triggerstring(sdi, opt_triggers, &trigger)) {
sr_session_destroy(session);
@@ -666,6 +696,9 @@ void run_session(void)
if (opt_continuous)
clear_anykey();
+ if (trigger)
+ sr_trigger_free(trigger);
+
sr_session_datafeed_callback_remove_all(session);
sr_session_destroy(session);