X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Fcsv.c;h=f892311205869ba0f65b4f9fa041a671b4e8b2a9;hb=HEAD;hp=28eedd6eadc02b55da4cec2cbfa6af0a28bf54cc;hpb=e36aae989cc9f747f5a0880bfae6a378d7e31e23;p=libsigrok.git

diff --git a/output/csv.c b/output/csv.c
deleted file mode 100644
index 28eedd6e..00000000
--- a/output/csv.c
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * This file is part of the libsigrok project.
- *
- * Copyright (C) 2011 Uwe Hermann <uwe@hermann-uwe.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include <glib.h>
-#include "config.h" /* Needed for PACKAGE_STRING and others. */
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
-
-#define LOG_PREFIX "output/csv"
-
-struct context {
-	unsigned int num_enabled_probes;
-	unsigned int unitsize;
-	uint64_t samplerate;
-	GString *header;
-	char separator;
-};
-
-/*
- * TODO:
- *  - Option to specify delimiter character and/or string.
- *  - Option to (not) print metadata as comments.
- *  - Option to specify the comment character(s), e.g. # or ; or C/C++-style.
- *  - 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.
- *  - Trigger support.
- */
-
-static int init(struct sr_output *o)
-{
-	struct context *ctx;
-	struct sr_probe *probe;
-	GSList *l;
-	GVariant *gvar;
-	int num_probes;
-	time_t t;
-
-	if (!o)
-		return SR_ERR_ARG;
-
-	if (!o->sdi)
-		return SR_ERR_ARG;
-
-	ctx = g_try_malloc0(sizeof(struct context));
-	o->internal = ctx;
-
-	/* 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)
-			continue;
-		if (!probe->enabled)
-			continue;
-		ctx->num_enabled_probes++;
-	}
-
-	ctx->unitsize = (ctx->num_enabled_probes + 7) / 8;
-
-	num_probes = g_slist_length(o->sdi->probes);
-
-	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;
-
-	ctx->separator = ',';
-	ctx->header = g_string_sized_new(512);
-
-	t = time(NULL);
-
-	/* 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);
-
-	/* 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)
-			continue;
-		if (!probe->enabled)
-			continue;
-		g_string_append_printf(ctx->header, " %s,", probe->name);
-	}
-	if (o->sdi->probes)
-		/* Drop last separator. */
-		g_string_truncate(ctx->header, ctx->header->len - 1);
-	g_string_append_printf(ctx->header, "\n");
-
-	return SR_OK;
-}
-
-static int receive(struct sr_output *o, const struct sr_dev_inst *sdi,
-		const struct sr_datafeed_packet *packet, GString **out)
-{
-	const struct sr_datafeed_logic *logic;
-	struct context *ctx;
-	uint64_t i, j;
-	gchar *p, c;
-
-	(void)sdi;
-
-	*out = NULL;
-	if (!o || !o->sdi)
-		return SR_ERR_ARG;
-	if (!(ctx = o->internal))
-		return SR_ERR_ARG;
-
-	switch (packet->type) {
-	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;
-		} 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));
-				g_string_append_c(*out, c ? '1' : '0');
-				g_string_append_c(*out, ctx->separator);
-			}
-			if (j) {
-				/* Drop last separator. */
-				g_string_truncate(*out, (*out)->len - 1);
-			}
-			g_string_append_printf(*out, "\n");
-		}
-		break;
-	case SR_DF_END:
-		g_free(o->internal);
-		o->internal = NULL;
-		break;
-	}
-
-	return SR_OK;
-}
-
-static int cleanup(struct sr_output *o)
-{
-	struct context *ctx;
-
-	if (!o || !o->sdi)
-		return SR_ERR_ARG;
-
-	if (o->internal) {
-		ctx = o->internal;
-		if (ctx->header)
-			g_string_free(ctx->header, TRUE);
-		g_free(o->internal);
-		o->internal = NULL;
-	}
-
-	return SR_OK;
-}
-
-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,
-};