X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=session.c;h=b36072cf7e0289f29cdc5f8a585a4a04ca2a090e;hb=e4e4b4724b27addf14b827314104295e4125396a;hp=b045119483a8238b1091fd8bf2c42e1c4343e98d;hpb=5d7604d168152ce4c419928b20f0ccfeb669ebba;p=sigrok-cli.git

diff --git a/session.c b/session.c
index b045119..b36072c 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,17 +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);
 
-		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 +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
 		}
@@ -299,7 +303,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 +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);
 			}
@@ -350,7 +354,7 @@ 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;
 	double tmp_double, dlow, dhigh;
 	uint64_t tmp_u64, p, q, low, high;
 	GVariant *rational[2], *range[2];
@@ -359,7 +363,7 @@ int opt_to_gvar(char *key, char *value, struct sr_config *src)
 	gchar **keyval;
 	int ret;
 
-	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;
 	}