X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=output%2Fgnuplot.c;h=968b5e370f749d353979d2fe19734757e6dff631;hp=e2655ff1b73b4ae10f83744936210c62435d1c0f;hb=ba7dd8bbb8168cba432a844259a3e239aa5f36d7;hpb=9c178ffa50da5bd6978d26989b79936dc341f308

diff --git a/output/gnuplot.c b/output/gnuplot.c
index e2655ff1..968b5e37 100644
--- a/output/gnuplot.c
+++ b/output/gnuplot.c
@@ -25,49 +25,38 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "output/gnuplot: "
-#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
-#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+#define LOG_PREFIX "output/gnuplot"
 
 struct context {
-	unsigned int num_enabled_probes;
+	unsigned int num_enabled_channels;
 	unsigned int unitsize;
-	char *probelist[SR_MAX_NUM_PROBES + 1];
 	char *header;
 	uint8_t *old_sample;
 };
 
-#define MAX_HEADER_LEN \
-	(1024 + (SR_MAX_NUM_PROBES * (SR_MAX_PROBENAME_LEN + 10)))
-
 static const char *gnuplot_header = "\
 # Sample data in space-separated columns format usable by gnuplot\n\
 #\n\
 # Generated by: %s on %s%s\
 # Period: %s\n\
 #\n\
-# Column\tProbe\n\
+# Column\tChannel\n\
 # -------------------------------------\
 ----------------------------------------\n\
 # 0\t\tSample counter (for internal gnuplot purposes)\n%s\n";
 
 static const char *gnuplot_header_comment = "\
-# Comment: Acquisition with %d/%d probes at %s\n";
+# Comment: Acquisition with %d/%d channels at %s\n";
 
 static int init(struct sr_output *o)
 {
 	struct context *ctx;
-	struct sr_probe *probe;
+	struct sr_channel *ch;
 	GSList *l;
 	GVariant *gvar;
 	uint64_t samplerate;
 	unsigned int i;
-	int b, num_probes;
+	int num_channels;
 	char *c, *frequency_s;
 	char wbuf[1000], comment[128];
 	time_t t;
@@ -82,79 +71,68 @@ static int init(struct sr_output *o)
 		return SR_ERR_ARG;
 	}
 
-	if (!o->sdi->driver) {
-		sr_err("%s: o->sdi->driver was NULL", __func__);
-		return SR_ERR_ARG;
-	}
-
 	if (!(ctx = g_try_malloc0(sizeof(struct context)))) {
 		sr_err("%s: ctx malloc failed", __func__);
 		return SR_ERR_MALLOC;
 	}
 
-	if (!(ctx->header = g_try_malloc0(MAX_HEADER_LEN + 1))) {
-		sr_err("%s: ctx->header malloc failed", __func__);
-		g_free(ctx);
-		return SR_ERR_MALLOC;
-	}
-
 	o->internal = ctx;
-	ctx->num_enabled_probes = 0;
-	for (l = o->sdi->probes; l; l = l->next) {
-		probe = l->data;
-		if (!probe->enabled)
+	ctx->num_enabled_channels = 0;
+	for (l = o->sdi->channels; l; l = l->next) {
+		ch = l->data;
+		if (ch->type != SR_PROBE_LOGIC)
+			continue;
+		if (!ch->enabled)
 			continue;
-		ctx->probelist[ctx->num_enabled_probes++] = probe->name;
+		ctx->num_enabled_channels++;
+	}
+	if (ctx->num_enabled_channels <= 0) {
+		sr_err("%s: no logic channel enabled", __func__);
+		return SR_ERR;
 	}
-	ctx->probelist[ctx->num_enabled_probes] = 0;
-	ctx->unitsize = (ctx->num_enabled_probes + 7) / 8;
 
-	num_probes = g_slist_length(o->sdi->probes);
+	ctx->unitsize = (ctx->num_enabled_channels + 7) / 8;
+
+	num_channels = g_slist_length(o->sdi->channels);
 	comment[0] = '\0';
 	samplerate = 0;
-	if (sr_dev_has_option(o->sdi, SR_CONF_SAMPLERATE)) {
-		o->sdi->driver->config_get(SR_CONF_SAMPLERATE, &gvar, o->sdi);
+	if (sr_config_get(o->sdi->driver, o->sdi, NULL, SR_CONF_SAMPLERATE,
+			&gvar) == SR_OK) {
 		samplerate = g_variant_get_uint64(gvar);
+		g_variant_unref(gvar);
 		if (!(frequency_s = sr_samplerate_string(samplerate))) {
 			sr_err("%s: sr_samplerate_string failed", __func__);
-			g_free(ctx->header);
 			g_free(ctx);
-			g_variant_unref(gvar);
 			return SR_ERR;
 		}
 		snprintf(comment, 127, gnuplot_header_comment,
-			ctx->num_enabled_probes, num_probes, frequency_s);
+			ctx->num_enabled_channels, num_channels, frequency_s);
 		g_free(frequency_s);
-		g_variant_unref(gvar);
 	}
 
 	/* Columns / channels */
 	wbuf[0] = '\0';
-	for (i = 0; i < ctx->num_enabled_probes; i++) {
+	for (i = 0, l = o->sdi->channels; l; l = l->next, i++) {
+		ch = l->data;
+		if (ch->type != SR_PROBE_LOGIC)
+			continue;
+		if (!ch->enabled)
+			continue;
 		c = (char *)&wbuf + strlen((const char *)&wbuf);
-		sprintf(c, "# %d\t\t%s\n", i + 1, ctx->probelist[i]);
+		sprintf(c, "# %d\t\t%s\n", i + 1, ch->name);
 	}
 
 	if (!(frequency_s = sr_period_string(samplerate))) {
 		sr_err("%s: sr_period_string failed", __func__);
-		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);
+	ctx->header = g_strdup_printf(gnuplot_header, PACKAGE_STRING,
+			ctime(&t), comment, frequency_s, (char *)&wbuf);
 	g_free(frequency_s);
 
-	if (b < 0) {
-		sr_err("%s: sprintf failed", __func__);
-		g_free(ctx->header);
-		g_free(ctx);
-		return SR_ERR;
-	}
-
 	if (!(ctx->old_sample = g_try_malloc0(ctx->unitsize))) {
 		sr_err("%s: ctx->old_sample malloc failed", __func__);
 		g_free(ctx->header);
@@ -237,7 +215,7 @@ static int data(struct sr_output *o, const uint8_t *data_in,
 	}
 
 	ctx = o->internal;
-	max_linelen = 16 + ctx->num_enabled_probes * 2;
+	max_linelen = 16 + ctx->num_enabled_channels * 2;
 	outsize = length_in / ctx->unitsize * max_linelen;
 	if (ctx->header)
 		outsize += strlen(ctx->header);
@@ -275,7 +253,7 @@ static int data(struct sr_output *o, const uint8_t *data_in,
 		sprintf((char *)c, "%" PRIu64 "\t", samplecount++);
 
 		/* The next columns are the values of all channels. */
-		for (p = 0; p < ctx->num_enabled_probes; p++) {
+		for (p = 0; p < ctx->num_enabled_channels; p++) {
 			curbit = (sample[p / 8] & ((uint8_t) (1 << (p % 8)))) >> (p % 8);
 			c = outbuf + strlen((const char *)outbuf);
 			sprintf((char *)c, "%d ", curbit);