X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Fcsv.c;h=d17969e8279db59b83599b179e5c818193b1f0a9;hb=1e23158b933e2c7d818d95fbbc45cb21cbff7065;hp=ab6217dfe77e6cb400a5819502c70de6e4d94b47;hpb=91aea754aaed0f0f2a6fc4b2b875f0d0b7c01f8e;p=libsigrok.git

diff --git a/output/csv.c b/output/csv.c
index ab6217df..d17969e8 100644
--- a/output/csv.c
+++ b/output/csv.c
@@ -28,11 +28,11 @@
 #define LOG_PREFIX "output/csv"
 
 struct context {
-	unsigned int num_enabled_probes;
-	unsigned int unitsize;
+	unsigned int num_enabled_channels;
 	uint64_t samplerate;
-	GString *header;
 	char separator;
+	gboolean header_done;
+	int *channel_index;
 };
 
 /*
@@ -43,89 +43,112 @@ struct context {
  *  - Option to (not) print samplenumber / time as extra column.
  *  - Option to "compress" output (only print changed samples, VCD-like).
  *  - Option to print comma-separated bits, or whole bytes/words (for 8/16
- *    probe LAs) as ASCII/hex etc. etc.
+ *    channel LAs) as ASCII/hex etc. etc.
  *  - Trigger support.
  */
 
 static int init(struct sr_output *o)
 {
 	struct context *ctx;
-	struct sr_channel *probe;
+	struct sr_channel *ch;
 	GSList *l;
-	GVariant *gvar;
-	int num_probes;
-	time_t t;
-
-	if (!o)
-		return SR_ERR_ARG;
+	int i;
 
-	if (!o->sdi)
+	if (!o || !o->sdi)
 		return SR_ERR_ARG;
 
-	ctx = g_try_malloc0(sizeof(struct context));
+	ctx = g_malloc0(sizeof(struct context));
 	o->internal = ctx;
+	ctx->separator = ',';
 
-	/* Get the number of probes, and the unitsize. */
-	for (l = o->sdi->probes; l; l = l->next) {
-		probe = l->data;
-		if (probe->type != SR_PROBE_LOGIC)
+	/* Get the number of channels, and the unitsize. */
+	for (l = o->sdi->channels; l; l = l->next) {
+		ch = l->data;
+		if (ch->type != SR_CHANNEL_LOGIC)
 			continue;
-		if (!probe->enabled)
+		if (!ch->enabled)
 			continue;
-		ctx->num_enabled_probes++;
+		ctx->num_enabled_channels++;
 	}
+	ctx->channel_index = g_malloc(sizeof(int) * ctx->num_enabled_channels);
 
-	ctx->unitsize = (ctx->num_enabled_probes + 7) / 8;
-
-	num_probes = g_slist_length(o->sdi->probes);
+	/* Once more to map the enabled channels. */
+	for (i = 0, l = o->sdi->channels; l; l = l->next) {
+		ch = l->data;
+		if (ch->type != SR_CHANNEL_LOGIC)
+			continue;
+		if (!ch->enabled)
+			continue;
+		ctx->channel_index[i++] = ch->index;
+	}
 
-	if (sr_config_get(o->sdi->driver, o->sdi, NULL, SR_CONF_SAMPLERATE,
-			&gvar) == SR_OK) {
-		ctx->samplerate = g_variant_get_uint64(gvar);
-		g_variant_unref(gvar);
-	} else
-		ctx->samplerate = 0;
+	return SR_OK;
+}
 
-	ctx->separator = ',';
-	ctx->header = g_string_sized_new(512);
+static GString *gen_header(struct sr_output *o)
+{
+	struct context *ctx;
+	struct sr_channel *ch;
+	GVariant *gvar;
+	GString *header;
+	GSList *l;
+	time_t t;
+	int num_channels, i;
+	char *samplerate_s;
 
-	t = time(NULL);
+	ctx = o->internal;
+	header = g_string_sized_new(512);
 
 	/* Some metadata */
-	g_string_append_printf(ctx->header, "; CSV, generated by %s on %s",
-			       PACKAGE_STRING, ctime(&t));
-	g_string_append_printf(ctx->header, "; Samplerate: %"PRIu64"\n",
-			       ctx->samplerate);
+	t = time(NULL);
+	g_string_append_printf(header, "; CSV, generated by %s on %s",
+			PACKAGE_STRING, ctime(&t));
 
 	/* Columns / channels */
-	g_string_append_printf(ctx->header, "; Channels (%d/%d):",
-			       ctx->num_enabled_probes, num_probes);
-	for (l = o->sdi->probes; l; l = l->next) {
-		probe = l->data;
-		if (probe->type != SR_PROBE_LOGIC)
+	num_channels = g_slist_length(o->sdi->channels);
+	g_string_append_printf(header, "; Channels (%d/%d):",
+			ctx->num_enabled_channels, num_channels);
+	for (i = 0, l = o->sdi->channels; l; l = l->next, i++) {
+		ch = l->data;
+		if (ch->type != SR_CHANNEL_LOGIC)
 			continue;
-		if (!probe->enabled)
+		if (!ch->enabled)
 			continue;
-		g_string_append_printf(ctx->header, " %s,", probe->name);
+		g_string_append_printf(header, " %s,", ch->name);
 	}
-	if (o->sdi->probes)
+	if (o->sdi->channels)
 		/* Drop last separator. */
-		g_string_truncate(ctx->header, ctx->header->len - 1);
-	g_string_append_printf(ctx->header, "\n");
+		g_string_truncate(header, header->len - 1);
+	g_string_append_printf(header, "\n");
+
+	if (ctx->samplerate == 0) {
+		if (sr_config_get(o->sdi->driver, o->sdi, NULL, SR_CONF_SAMPLERATE,
+				&gvar) == SR_OK) {
+			ctx->samplerate = g_variant_get_uint64(gvar);
+			g_variant_unref(gvar);
+		}
+	}
+	if (ctx->samplerate != 0) {
+		samplerate_s = sr_samplerate_string(ctx->samplerate);
+		g_string_append_printf(header, "; Samplerate: %s\n", samplerate_s);
+		g_free(samplerate_s);
+	}
 
-	return SR_OK;
+	return header;
 }
 
-static int receive(struct sr_output *o, const struct sr_dev_inst *sdi,
-		const struct sr_datafeed_packet *packet, GString **out)
+static int receive(struct sr_output *o, const struct sr_datafeed_packet *packet,
+		GString **out)
 {
+	const struct sr_datafeed_meta *meta;
 	const struct sr_datafeed_logic *logic;
+	const struct sr_config *src;
+	GSList *l;
 	struct context *ctx;
+	int idx;
 	uint64_t i, j;
 	gchar *p, c;
 
-	(void)sdi;
-
 	*out = NULL;
 	if (!o || !o->sdi)
 		return SR_ERR_ARG;
@@ -133,23 +156,29 @@ static int receive(struct sr_output *o, const struct sr_dev_inst *sdi,
 		return SR_ERR_ARG;
 
 	switch (packet->type) {
+	case SR_DF_META:
+		meta = packet->payload;
+		for (l = meta->config; l; l = l->next) {
+			src = l->data;
+			if (src->key != SR_CONF_SAMPLERATE)
+				continue;
+			ctx->samplerate = g_variant_get_uint64(src->data);
+		}
+		break;
 	case SR_DF_LOGIC:
 		logic = packet->payload;
-		if (ctx->header) {
-			/*
-			 * First data packet: prime the output with the
-			 * previously prepared header.
-			 */
-			*out = ctx->header;
-			ctx->header = NULL;
+		if (!ctx->header_done) {
+			*out = gen_header(o);
+			ctx->header_done = TRUE;
 		} else {
 			*out = g_string_sized_new(512);
 		}
 
-		for (i = 0; i <= logic->length - ctx->unitsize; i += ctx->unitsize) {
-			for (j = 0; j < ctx->num_enabled_probes; j++) {
-				p = logic->data + i + j / 8;
-				c = *p & (1 << (j % 8));
+		for (i = 0; i <= logic->length - logic->unitsize; i += logic->unitsize) {
+			for (j = 0; j < ctx->num_enabled_channels; j++) {
+				idx = ctx->channel_index[j];
+				p = logic->data + i + idx / 8;
+				c = *p & (1 << (idx % 8));
 				g_string_append_c(*out, c ? '1' : '0');
 				g_string_append_c(*out, ctx->separator);
 			}
@@ -160,10 +189,6 @@ static int receive(struct sr_output *o, const struct sr_dev_inst *sdi,
 			g_string_append_printf(*out, "\n");
 		}
 		break;
-	case SR_DF_END:
-		g_free(o->internal);
-		o->internal = NULL;
-		break;
 	}
 
 	return SR_OK;
@@ -178,8 +203,7 @@ static int cleanup(struct sr_output *o)
 
 	if (o->internal) {
 		ctx = o->internal;
-		if (ctx->header)
-			g_string_free(ctx->header, TRUE);
+		g_free(ctx->channel_index);
 		g_free(o->internal);
 		o->internal = NULL;
 	}
@@ -190,7 +214,6 @@ static int cleanup(struct sr_output *o)
 SR_PRIV struct sr_output_format output_csv = {
 	.id = "csv",
 	.description = "Comma-separated values (CSV)",
-	.df_type = SR_DF_LOGIC,
 	.init = init,
 	.receive = receive,
 	.cleanup = cleanup,