X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=session.c;h=d7bdf8a0579e9a7cb9686ca50f5a4523cec57687;hp=07144aa4ee70fb02eeefe68de64d140095382c38;hb=87e24fedeb35cb7d5b1c593150ac1a92cf10cf4d;hpb=7a638873128dedfcad1e77d87c3d2c25516abaf2

diff --git a/session.c b/session.c
index 07144aa..d7bdf8a 100644
--- a/session.c
+++ b/session.c
@@ -23,7 +23,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-static struct sr_output_format *output_format = NULL;
 static int default_output_format = FALSE;
 static uint64_t limit_samples = 0;
 static uint64_t limit_frames = 0;
@@ -72,12 +71,12 @@ static int set_limit_time(const struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-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)
 {
-	GHashTable *fmtargs;
-	struct sr_output *o;
-	struct sr_output_format **outputs;
-	int i;
+	const struct sr_output_module *omod;
+	const struct sr_option **options;
+	const struct sr_output *o;
+	GHashTable *fmtargs, *fmtopts;
 	char *fmtspec;
 
 	if (opt_output_format && !strcmp(opt_output_format, "sigrok")) {
@@ -99,17 +98,17 @@ struct sr_output *setup_output_format(const struct sr_dev_inst *sdi)
 	fmtspec = g_hash_table_lookup(fmtargs, "sigrok_key");
 	if (!fmtspec)
 		g_critical("Invalid output format.");
-	outputs = sr_output_list();
-	for (i = 0; outputs[i]; i++) {
-		if (strcmp(outputs[i]->id, fmtspec))
-			continue;
-		g_hash_table_remove(fmtargs, "sigrok_key");
-		output_format = outputs[i];
-		break;
-	}
-	if (!output_format)
-		g_critical("Invalid output format '%s'.", opt_output_format);
-	o = sr_output_new(output_format, fmtargs, sdi);
+	if (!(omod = sr_output_find(fmtspec)))
+		g_critical("Unknown output module '%s'.", fmtspec);
+	g_hash_table_remove(fmtargs, "sigrok_key");
+	if ((options = sr_output_options_get(omod))) {
+		fmtopts = generic_arg_to_opt(options, fmtargs);
+		sr_output_options_free(options);
+	} else
+		fmtopts = NULL;
+	o = sr_output_new(omod, fmtopts, sdi);
+	if (fmtopts)
+		g_hash_table_destroy(fmtopts);
 	g_hash_table_destroy(fmtargs);
 
 	return o;
@@ -121,9 +120,11 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 	const struct sr_datafeed_meta *meta;
 	const struct sr_datafeed_logic *logic;
 	const struct sr_datafeed_analog *analog;
+	struct sr_session *session;
 	struct sr_config *src;
 	struct sr_channel *ch;
-	static struct sr_output *o = NULL;
+	static const struct sr_output *o = NULL;
+	static const struct sr_output *oa = NULL;
 	static uint64_t rcvd_samples_logic = 0;
 	static uint64_t rcvd_samples_analog = 0;
 	static uint64_t samplerate = 0;
@@ -137,16 +138,19 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 	int i;
 	char **channels;
 
-	(void) cb_data;
-
 	/* If the first packet to come in isn't a header, don't even try. */
 	if (packet->type != SR_DF_HEADER && o == NULL)
 		return;
 
+	session = cb_data;
 	switch (packet->type) {
 	case SR_DF_HEADER:
 		g_debug("cli: Received SR_DF_HEADER.");
-		o = setup_output_format(sdi);
+		if (!(o = setup_output_format(sdi)))
+			g_critical("Failed to initialize output module.");
+
+		/* Set up backup analog output module. */
+		oa = sr_output_new(sr_output_find("analog"), NULL, sdi);
 
 		/* Prepare non-stdout output. */
 		outfile = stdout;
@@ -249,17 +253,17 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 						channels[i++] = ch->name;
 				}
 				channels[i] = NULL;
-				sr_session_save_init(opt_output_file, samplerate,
-						channels);
+				sr_session_save_init(session, opt_output_file,
+						samplerate, channels);
 				g_free(channels);
 			}
-			save_chunk_logic(logic->data, input_len, logic->unitsize);
+			save_chunk_logic(session, logic->data, input_len, logic->unitsize);
 		} else {
 			if (opt_pds) {
 #ifdef HAVE_SRD
 				if (srd_session_send(srd_sess, rcvd_samples_logic, end_sample,
 						logic->data, input_len) != SRD_OK)
-					sr_session_stop();
+					sr_session_stop(session);
 #endif
 			}
 		}
@@ -292,10 +296,19 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 	}
 
 	if (o && outfile && !opt_pds) {
-		if (sr_output_send(o, packet, &out) == SR_OK && out) {
-			fwrite(out->str, 1, out->len, outfile);
-			fflush(outfile);
-			g_string_free(out, TRUE);
+		if (sr_output_send(o, packet, &out) == SR_OK) {
+			if (!out || (out->len == 0 && default_output_format
+					&& packet->type == SR_DF_ANALOG)) {
+				/* 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) {
+				fwrite(out->str, 1, out->len, outfile);
+				fflush(outfile);
+			}
+			if (out)
+				g_string_free(out, TRUE);
 		}
 	}
 
@@ -308,12 +321,15 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 			sr_output_free(o);
 		o = NULL;
 
+		sr_output_free(oa);
+		oa = NULL;
+
 		if (outfile && outfile != stdout)
 			fclose(outfile);
 
 		if (opt_output_file && default_output_format)
 			/* Flush whatever is left out to the session file. */
-			save_chunk_logic(NULL, 0, 0);
+			save_chunk_logic(session, NULL, 0, 0);
 
 		if (limit_samples) {
 			if (rcvd_samples_logic > 0 && rcvd_samples_logic < limit_samples)
@@ -445,6 +461,8 @@ void run_session(void)
 	GSList *devices;
 	GHashTable *devargs;
 	GVariant *gvar;
+	struct sr_session *session;
+	struct sr_trigger *trigger;
 	struct sr_dev_inst *sdi;
 	uint64_t min_samples, max_samples;
 
@@ -455,21 +473,23 @@ void run_session(void)
 	}
 	if (g_slist_length(devices) > 1) {
 		g_critical("sigrok-cli only supports one device for capturing.");
+		g_slist_free(devices);
 		return;
 	}
 	sdi = devices->data;
+	g_slist_free(devices);
 
-	sr_session_new();
-	sr_session_datafeed_callback_add(datafeed_in, NULL);
+	sr_session_new(&session);
+	sr_session_datafeed_callback_add(session, datafeed_in, NULL);
 
 	if (sr_dev_open(sdi) != SR_OK) {
 		g_critical("Failed to open device.");
 		return;
 	}
 
-	if (sr_session_dev_add(sdi) != SR_OK) {
+	if (sr_session_dev_add(session, sdi) != SR_OK) {
 		g_critical("Failed to add device to session.");
-		sr_session_destroy();
+		sr_session_destroy(session);
 		return;
 	}
 
@@ -483,13 +503,17 @@ void run_session(void)
 
 	if (select_channels(sdi) != SR_OK) {
 		g_critical("Failed to set channels.");
-		sr_session_destroy();
+		sr_session_destroy(session);
 		return;
 	}
 
 	if (opt_triggers) {
-		if (!parse_triggerstring(sdi, opt_triggers)) {
-			sr_session_destroy();
+		if (!parse_triggerstring(sdi, opt_triggers, &trigger)) {
+			sr_session_destroy(session);
+			return;
+		}
+		if (sr_session_trigger_set(session, trigger) != SR_OK) {
+			sr_session_destroy(session);
 			return;
 		}
 	}
@@ -497,14 +521,14 @@ void run_session(void)
 	if (opt_continuous) {
 		if (!sr_dev_has_option(sdi, SR_CONF_CONTINUOUS)) {
 			g_critical("This device does not support continuous sampling.");
-			sr_session_destroy();
+			sr_session_destroy(session);
 			return;
 		}
 	}
 
 	if (opt_time) {
 		if (set_limit_time(sdi) != SR_OK) {
-			sr_session_destroy();
+			sr_session_destroy(session);
 			return;
 		}
 	}
@@ -512,7 +536,7 @@ void run_session(void)
 	if (opt_samples) {
 		if ((sr_parse_sizestring(opt_samples, &limit_samples) != SR_OK)) {
 			g_critical("Invalid sample limit '%s'.", opt_samples);
-			sr_session_destroy();
+			sr_session_destroy(session);
 			return;
 		}
 		if (sr_config_list(sdi->driver, sdi, NULL,
@@ -533,7 +557,7 @@ void run_session(void)
 		gvar = g_variant_new_uint64(limit_samples);
 		if (sr_config_set(sdi, NULL, SR_CONF_LIMIT_SAMPLES, gvar) != SR_OK) {
 			g_critical("Failed to configure sample limit.");
-			sr_session_destroy();
+			sr_session_destroy(session);
 			return;
 		}
 	}
@@ -541,38 +565,38 @@ void run_session(void)
 	if (opt_frames) {
 		if ((sr_parse_sizestring(opt_frames, &limit_frames) != SR_OK)) {
 			g_critical("Invalid sample limit '%s'.", opt_samples);
-			sr_session_destroy();
+			sr_session_destroy(session);
 			return;
 		}
 		gvar = g_variant_new_uint64(limit_frames);
 		if (sr_config_set(sdi, NULL, SR_CONF_LIMIT_FRAMES, gvar) != SR_OK) {
 			g_critical("Failed to configure frame limit.");
-			sr_session_destroy();
+			sr_session_destroy(session);
 			return;
 		}
 	}
 
-	if (sr_session_start() != SR_OK) {
+	if (sr_session_start(session) != SR_OK) {
 		g_critical("Failed to start session.");
-		sr_session_destroy();
+		sr_session_destroy(session);
 		return;
 	}
 
 	if (opt_continuous)
-		add_anykey();
+		add_anykey(session);
 
-	sr_session_run();
+	sr_session_run(session);
 
 	if (opt_continuous)
 		clear_anykey();
 
-	sr_session_datafeed_callback_remove_all();
-	sr_session_destroy();
-	g_slist_free(devices);
+	sr_session_datafeed_callback_remove_all(session);
+	sr_session_destroy(session);
 
 }
 
-void save_chunk_logic(uint8_t *data, uint64_t data_len, int unitsize)
+void save_chunk_logic(struct sr_session *session, uint8_t *data,
+		uint64_t data_len, int unitsize)
 {
 	static uint8_t *buf = NULL;
 	static int buf_len = 0;
@@ -582,16 +606,22 @@ void save_chunk_logic(uint8_t *data, uint64_t data_len, int unitsize)
 	if (!buf)
 		buf = g_malloc(SAVE_CHUNK_SIZE);
 
+	while (data_len > SAVE_CHUNK_SIZE) {
+		save_chunk_logic(session, data, SAVE_CHUNK_SIZE, unitsize);
+		data += SAVE_CHUNK_SIZE;
+		data_len -= SAVE_CHUNK_SIZE;
+	}
+
 	if (buf_len + data_len > SAVE_CHUNK_SIZE) {
 		max = (SAVE_CHUNK_SIZE - buf_len) / unitsize * unitsize;
 		memcpy(buf + buf_len, data, max);
-		sr_session_append(opt_output_file, buf, unitsize,
+		sr_session_append(session, opt_output_file, buf, unitsize,
 				(buf_len + max) / unitsize);
 		memcpy(buf, data + max, data_len - max);
 		buf_len = data_len - max;
 	} else if (data_len == 0 && last_unitsize != 0) {
 		/* End of data, flush the buffer out. */
-		sr_session_append(opt_output_file, buf, last_unitsize,
+		sr_session_append(session, opt_output_file, buf, last_unitsize,
 				buf_len / last_unitsize);
 	} else {
 		/* Buffer chunk. */