X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=session.c;h=1d98877801a429e3f0b437f976f7958f68871056;hp=b4ff3ffd9645abcd0fc081fae5e2f996bca9bcf0;hb=84b39e3e488c4897df5afb5ffeca21ef30c71fba;hpb=5899178d2d92d12bb8bed7e6b874ea778b7329c2

diff --git a/session.c b/session.c
index b4ff3ff..1d98877 100644
--- a/session.c
+++ b/session.c
@@ -74,7 +74,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 +104,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,31 +183,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);
 
-		/*
-		 * Don't open a file when using the "srzip" output format.
-		 * The srzip output module does open/write/rename/close
-		 * on its own. This is especially important on Windows since
-		 * libzip (used by srzip) will try to rename a temporary
-		 * ZIP file to the final *.sr filename as specified by
-		 * the sigrok-cli user. However, on Windows file renames
-		 * of files that are already opened by any process are not
-		 * possible. Thus, we don't open the *.sr file here,
-		 * but rather let srzip perform all file operations.
-		 */
-		if (opt_output_file) {
-			/* Only open the file if output format != srzip. */
-			if (!g_str_has_prefix(opt_output_format, "srzip"))
-				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,
@@ -281,7 +271,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
 		}
@@ -313,7 +303,7 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 		break;
 	}
 
-	if (o && (outfile || g_str_has_prefix(opt_output_format, "srzip")) && !opt_pds) {
+	if (o && !opt_pds) {
 		if (sr_output_send(o, packet, &out) == SR_OK) {
 			if (!out || (out->len == 0
 					&& !opt_output_format
@@ -324,7 +314,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);
 			}
@@ -364,16 +354,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;
 	}
@@ -462,6 +453,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 /<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);