From: Uwe Hermann <redacted>
Date: Sun, 11 Nov 2012 12:11:58 +0000 (+0100)
Subject: output/gnuplot: Drop obsolete code.
X-Git-Tag: dsupstream~556
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=a0a23863daecce5b7aaff352ad2bc5f47eb9bd0b;p=libsigrok.git

output/gnuplot: Drop obsolete code.
---

diff --git a/output/gnuplot.c b/output/gnuplot.c
index 6d1d28f2..7a7c2d46 100644
--- a/output/gnuplot.c
+++ b/output/gnuplot.c
@@ -286,156 +286,3 @@ SR_PRIV struct sr_output_format output_gnuplot = {
 	.data = data,
 	.event = event,
 };
-
-/* Temporarily disabled. */
-#if 0
-static int analog_init(struct sr_output *o)
-{
-	struct context *ctx;
-	struct sr_probe *probe;
-	GSList *l;
-	uint64_t samplerate;
-	unsigned int i;
-	int b, num_probes;
-	char *c, *frequency_s;
-	char wbuf[1000], comment[128];
-	time_t t;
-
-	if (!(ctx = g_try_malloc0(sizeof(struct context)))) {
-		sr_err("gnuplot out: %s: ctx malloc failed", __func__);
-		return SR_ERR_MALLOC;
-	}
-
-	if (!(ctx->header = g_try_malloc0(MAX_HEADER_LEN + 1))) {
-		g_free(ctx);
-		sr_err("gnuplot out: %s: ctx->header malloc failed", __func__);
-		return SR_ERR_MALLOC;
-	}
-
-	o->internal = ctx;
-	ctx->num_enabled_probes = 0;
-	for (l = o->dev->probes; l; l = l->next) {
-		probe = l->data;
-		if (!probe->enabled)
-			continue;
-		ctx->probelist[ctx->num_enabled_probes++] = probe->name;
-	}
-	ctx->probelist[ctx->num_enabled_probes] = 0;
-//	ctx->unitsize = (ctx->num_enabled_probes + 7) / 8;
-	ctx->unitsize = sizeof(struct sr_analog_sample) +
-			(ctx->num_enabled_probes * sizeof(struct sr_analog_probe));
-
-	num_probes = g_slist_length(o->dev->probes);
-	comment[0] = '\0';
-	if (o->dev->driver && sr_dev_has_hwcap(o->dev, SR_HWCAP_SAMPLERATE)) {
-		samplerate = *((uint64_t *) o->dev->driver->dev_info_get(
-				o->dev->driver_index, SR_DI_CUR_SAMPLERATE));
-		if (!(frequency_s = sr_samplerate_string(samplerate))) {
-			g_free(ctx->header);
-			g_free(ctx);
-			return SR_ERR;
-		}
-		snprintf(comment, 127, gnuplot_header_comment,
-			ctx->num_enabled_probes, num_probes, frequency_s);
-		g_free(frequency_s);
-	}
-
-	/* Columns / channels */
-	wbuf[0] = '\0';
-	for (i = 0; i < ctx->num_enabled_probes; i++) {
-		c = (char *)&wbuf + strlen((char *)&wbuf);
-		sprintf(c, "# %d\t\t%s\n", i + 1, ctx->probelist[i]);
-	}
-
-	if (!(frequency_s = sr_period_string(samplerate))) {
-		g_free(ctx->header);
-		g_free(ctx);
-		return SR_ERR;
-	}
-	t = time(NULL);
-	b = snprintf(ctx->header, MAX_HEADER_LEN, gnuplot_header,
-		     PACKAGE_STRING, ctime(&t), comment, frequency_s,
-		     (char *)&wbuf);
-	g_free(frequency_s);
-
-	if (b < 0) {
-		g_free(ctx->header);
-		g_free(ctx);
-		return SR_ERR;
-	}
-
-	return 0;
-}
-
-static int analog_data(struct sr_output *o, uint8_t *data_in,
-		       uint64_t length_in, uint8_t **data_out,
-		       uint64_t *length_out)
-{
-	struct context *ctx;
-	unsigned int max_linelen, outsize, p, /* curbit, */ i;
-//	uint64_t sample;
-	static uint64_t samplecount = 0;
-	uint8_t *outbuf, *c;
-	struct sr_analog_sample *sample;
-
-	ctx = o->internal;
-//	max_linelen = 16 + ctx->num_enabled_probes * 2;
-	max_linelen = 16 + ctx->num_enabled_probes * 30;
-	outsize = length_in / ctx->unitsize * max_linelen;
-	if (ctx->header)
-		outsize += strlen(ctx->header);
-
-	if (!(outbuf = g_try_malloc0(outsize))) {
-		sr_err("gnuplot out: %s: outbuf malloc failed", __func__);
-		return SR_ERR_MALLOC;
-	}
-
-	outbuf[0] = '\0';
-	if (ctx->header) {
-		/* The header is still here, this must be the first packet. */
-		strncpy(outbuf, ctx->header, outsize);
-		g_free(ctx->header);
-		ctx->header = NULL;
-	}
-
-	for (i = 0; i <= length_in - ctx->unitsize; i += ctx->unitsize) {
-//		memcpy(&sample, data_in + i, ctx->unitsize);
-		sample = (struct sr_analog_sample *) (data_in + i);
-
-		/* The first column is a counter (needed for gnuplot). */
-		c = outbuf + strlen(outbuf);
-		sprintf(c, "%" PRIu64 "\t", samplecount++);
-
-		/* The next columns are the values of all channels. */
-		for (p = 0; p < ctx->num_enabled_probes; p++) {
-//			curbit = (sample & ((uint64_t) (1 << p))) >> p;
-			c = outbuf + strlen(outbuf);
-//			sprintf(c, "%d ", curbit);
-			/*
-			 * FIXME: Should be doing proper raw->voltage conversion
-			 * here, casting to int16_t isn't it. Remember that if
-			 * res = 1 conversion isn't necessary.
-			 */
-			sprintf(c, "%f ", (double) ((int16_t) (sample->probes[p].val &
-					((1 << sample->probes[p].res) - 1))));
-		}
-
-		c = outbuf + strlen(outbuf);
-		sprintf(c, "\n");
-	}
-
-	*data_out = outbuf;
-	*length_out = strlen(outbuf);
-
-	return SR_OK;
-}
-
-struct sr_output_format output_analog_gnuplot = {
-	.id = "analog_gnuplot",
-	.description = "Gnuplot analog",
-	.df_type = SR_DF_ANALOG,
-	.init = analog_init,
-	.data = analog_data,
-	.event = event,
-};
-#endif