X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=session.c;h=7b2aaf4a304dbb611ded1c26304ad7a2b58c08c2;hp=1e737a6c7c154c37233c139c4e5631a2f44370a5;hb=b4d72c27b716b729a35e5d985f11f69ef5e2fa8e;hpb=8b65cdcc7db2ea380003fe98d93782e4343b8e70

diff --git a/session.c b/session.c
index 1e737a6..7b2aaf4 100644
--- a/session.c
+++ b/session.c
@@ -18,7 +18,6 @@
  */
 
 #include "sigrok-cli.h"
-#include "config.h"
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <string.h>
@@ -26,7 +25,6 @@
 
 static struct sr_output_format *output_format = NULL;
 static int default_output_format = FALSE;
-static char *output_format_param = NULL;
 static uint64_t limit_samples = 0;
 static uint64_t limit_frames = 0;
 
@@ -84,11 +82,10 @@ static int set_limit_time(const struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-int setup_output_format(void)
+struct sr_output *setup_output_format(const struct sr_dev_inst *sdi)
 {
 	GHashTable *fmtargs;
-	GHashTableIter iter;
-	gpointer key, value;
+	struct sr_output *o;
 	struct sr_output_format **outputs;
 	int i;
 	char *fmtspec;
@@ -110,32 +107,22 @@ int setup_output_format(void)
 
 	fmtargs = parse_generic_arg(opt_output_format, TRUE);
 	fmtspec = g_hash_table_lookup(fmtargs, "sigrok_key");
-	if (!fmtspec) {
+	if (!fmtspec)
 		g_critical("Invalid output format.");
-		return 1;
-	}
 	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];
-		g_hash_table_iter_init(&iter, fmtargs);
-		while (g_hash_table_iter_next(&iter, &key, &value)) {
-			/* only supporting one parameter per output module
-			 * for now, and only its value */
-			output_format_param = g_strdup(value);
-			break;
-		}
 		break;
 	}
-	if (!output_format) {
-		g_critical("Invalid output format %s.", opt_output_format);
-		return 1;
-	}
+	if (!output_format)
+		g_critical("Invalid output format '%s'.", opt_output_format);
+	o = sr_output_new(output_format, fmtargs, sdi);
 	g_hash_table_destroy(fmtargs);
 
-	return 0;
+	return o;
 }
 
 void datafeed_in(const struct sr_dev_inst *sdi,
@@ -156,8 +143,7 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 	GString *out;
 	GVariant *gvar;
 	uint64_t end_sample;
-	uint64_t output_len, input_len;
-	uint8_t *output_buf;
+	uint64_t input_len;
 	int i;
 	char **channels;
 
@@ -170,20 +156,7 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 	switch (packet->type) {
 	case SR_DF_HEADER:
 		g_debug("cli: Received SR_DF_HEADER");
-		/* Initialize the output module. */
-		if (!(o = g_try_malloc(sizeof(struct sr_output)))) {
-			g_critical("Output module malloc failed.");
-			exit(1);
-		}
-		o->format = output_format;
-		o->sdi = (struct sr_dev_inst *)sdi;
-		o->param = output_format_param;
-		if (o->format->init) {
-			if (o->format->init(o) != SR_OK) {
-				g_critical("Output format initialization failed.");
-				exit(1);
-			}
-		}
+		o = setup_output_format(sdi);
 
 		/* Prepare non-stdout output. */
 		outfile = stdout;
@@ -252,9 +225,6 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 
 	case SR_DF_TRIGGER:
 		g_debug("cli: received SR_DF_TRIGGER");
-		if (o->format->event)
-			o->format->event(o, SR_DF_TRIGGER, &output_buf,
-					 &output_len);
 		triggered = 1;
 		break;
 
@@ -300,16 +270,6 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 						logic->data, input_len) != SRD_OK)
 					sr_session_stop();
 #endif
-			} else {
-				output_len = 0;
-				if (o->format->data && packet->type == o->format->df_type)
-					o->format->data(o, logic->data, input_len,
-							&output_buf, &output_len);
-				if (output_len) {
-					fwrite(output_buf, 1, output_len, outfile);
-					fflush(outfile);
-					g_free(output_buf);
-				}
 			}
 		}
 
@@ -325,52 +285,23 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 		if (limit_samples && rcvd_samples_analog >= limit_samples)
 			break;
 
-		if (o->format->data && packet->type == o->format->df_type) {
-			o->format->data(o, (const uint8_t *)analog->data,
-					analog->num_samples * sizeof(float),
-					&output_buf, &output_len);
-			if (output_buf) {
-				fwrite(output_buf, 1, output_len, outfile);
-				fflush(outfile);
-				g_free(output_buf);
-			}
-		}
-
 		rcvd_samples_analog += analog->num_samples;
 		break;
 
 	case SR_DF_FRAME_BEGIN:
 		g_debug("cli: received SR_DF_FRAME_BEGIN");
-		if (o->format->event) {
-			o->format->event(o, SR_DF_FRAME_BEGIN, &output_buf,
-					 &output_len);
-			if (output_buf) {
-				fwrite(output_buf, 1, output_len, outfile);
-				fflush(outfile);
-				g_free(output_buf);
-			}
-		}
 		break;
 
 	case SR_DF_FRAME_END:
 		g_debug("cli: received SR_DF_FRAME_END");
-		if (o->format->event) {
-			o->format->event(o, SR_DF_FRAME_END, &output_buf,
-					 &output_len);
-			if (output_buf) {
-				fwrite(output_buf, 1, output_len, outfile);
-				fflush(outfile);
-				g_free(output_buf);
-			}
-		}
 		break;
 
 	default:
 		break;
 	}
 
-	if (o && o->format->receive) {
-		if (o->format->receive(o, sdi, packet, &out) == SR_OK && out) {
+	if (o && !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);
@@ -382,19 +313,8 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 	if (packet->type == SR_DF_END) {
 		g_debug("cli: Received SR_DF_END");
 
-		if (o->format->event) {
-			o->format->event(o, SR_DF_END, &output_buf, &output_len);
-			if (output_buf) {
-				if (outfile)
-					fwrite(output_buf, 1, output_len, outfile);
-				g_free(output_buf);
-				output_len = 0;
-			}
-		}
-
-		if (o->format->cleanup)
-			o->format->cleanup(o);
-		g_free(o);
+		if (o)
+			sr_output_free(o);
 		o = NULL;
 
 		if (outfile && outfile != stdout)