X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Fgnuplot.c;h=6e0e745f7b74d7f9bfefa98dc11d061c2afb1531;hb=545f9786390a89b8bb6868907afa555fc0a6ece4;hp=77ca39fe59c4d90da234201621bdb85b16ad464b;hpb=1a081ca67d63a0bd933a3d715792d85afd437296;p=libsigrok.git

diff --git a/output/gnuplot.c b/output/gnuplot.c
index 77ca39fe..6e0e745f 100644
--- a/output/gnuplot.c
+++ b/output/gnuplot.c
@@ -21,9 +21,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include "config.h"
-#include "sigrok.h"
-#include "sigrok-internal.h"
+#include "config.h" /* Needed for PACKAGE_STRING and others. */
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 
 struct context {
 	unsigned int num_enabled_probes;
@@ -54,7 +54,7 @@ static int init(struct sr_output *o)
 	struct context *ctx;
 	struct sr_probe *probe;
 	GSList *l;
-	uint64_t samplerate;
+	uint64_t *samplerate;
 	unsigned int i;
 	int b, num_probes;
 	char *c, *frequency_s;
@@ -62,36 +62,34 @@ static int init(struct sr_output *o)
 	time_t t;
 
 	if (!o) {
-		sr_warn("gnuplot out: %s: o was NULL", __func__);
+		sr_err("gnuplot out: %s: o was NULL", __func__);
 		return SR_ERR_ARG;
 	}
 
-	if (!o->device) {
-		sr_warn("gnuplot out: %s: o->device was NULL", __func__);
+	if (!o->sdi) {
+		sr_err("gnuplot out: %s: o->sdi was NULL", __func__);
 		return SR_ERR_ARG;
 	}
 
-	if (!o->device->plugin) {
-		sr_warn("gnuplot out: %s: o->device->plugin was NULL",
-			__func__);
+	if (!o->sdi->driver) {
+		sr_err("gnuplot out: %s: o->sdi->driver was NULL", __func__);
 		return SR_ERR_ARG;
 	}
 
-	if (!(ctx = calloc(1, sizeof(struct context)))) {
-		sr_warn("gnuplot out: %s: ctx calloc failed", __func__);
+	if (!(ctx = g_try_malloc0(sizeof(struct context)))) {
+		sr_err("gnuplot out: %s: ctx malloc failed", __func__);
 		return SR_ERR_MALLOC;
 	}
 
-	if (!(ctx->header = calloc(1, MAX_HEADER_LEN + 1))) {
-		sr_warn("gnuplot out: %s: ctx->header calloc failed",
-			__func__);
-		free(ctx);
+	if (!(ctx->header = g_try_malloc0(MAX_HEADER_LEN + 1))) {
+		sr_err("gnuplot out: %s: ctx->header malloc failed", __func__);
+		g_free(ctx);
 		return SR_ERR_MALLOC;
 	}
 
 	o->internal = ctx;
 	ctx->num_enabled_probes = 0;
-	for (l = o->device->probes; l; l = l->next) {
+	for (l = o->sdi->probes; l; l = l->next) {
 		probe = l->data; /* TODO: Error checks. */
 		if (!probe->enabled)
 			continue;
@@ -100,34 +98,34 @@ static int init(struct sr_output *o)
 	ctx->probelist[ctx->num_enabled_probes] = 0;
 	ctx->unitsize = (ctx->num_enabled_probes + 7) / 8;
 
-	num_probes = g_slist_length(o->device->probes);
+	num_probes = g_slist_length(o->sdi->probes);
 	comment[0] = '\0';
-	if (sr_device_has_hwcap(o->device, SR_HWCAP_SAMPLERATE)) {
-		samplerate = *((uint64_t *) o->device->plugin->get_device_info(
-				o->device->plugin_index, SR_DI_CUR_SAMPLERATE));
-		if (!(frequency_s = sr_samplerate_string(samplerate))) {
-			sr_warn("gnuplot out: %s: sr_samplerate_string failed",
-				__func__);
-			free(ctx->header);
-			free(ctx);
+	if (sr_dev_has_hwcap(o->sdi, SR_HWCAP_SAMPLERATE)) {
+		o->sdi->driver->info_get(SR_DI_CUR_SAMPLERATE,
+				(const void **)&samplerate, o->sdi);
+		if (!(frequency_s = sr_samplerate_string(*samplerate))) {
+			sr_err("gnuplot out: %s: sr_samplerate_string failed",
+			       __func__);
+			g_free(ctx->header);
+			g_free(ctx);
 			return SR_ERR;
 		}
 		snprintf(comment, 127, gnuplot_header_comment,
 			ctx->num_enabled_probes, num_probes, frequency_s);
-		free(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);
+		c = (char *)&wbuf + strlen((const char *)&wbuf);
 		sprintf(c, "# %d\t\t%s\n", i + 1, ctx->probelist[i]);
 	}
 
-	if (!(frequency_s = sr_period_string(samplerate))) {
-		sr_warn("gnuplot out: %s: sr_period_string failed", __func__);
-		free(ctx->header);
-		free(ctx);
+	if (!(frequency_s = sr_period_string(*samplerate))) {
+		sr_err("gnuplot out: %s: sr_period_string failed", __func__);
+		g_free(ctx->header);
+		g_free(ctx);
 		return SR_ERR;
 	}
 
@@ -135,51 +133,47 @@ static int init(struct sr_output *o)
 	b = snprintf(ctx->header, MAX_HEADER_LEN, gnuplot_header,
 		     PACKAGE_STRING, ctime(&t), comment, frequency_s,
 		     (char *)&wbuf);
-	free(frequency_s);
+	g_free(frequency_s);
 
 	if (b < 0) {
-		sr_warn("gnuplot out: %s: sprintf failed", __func__);
-		free(ctx->header);
-		free(ctx);
+		sr_err("gnuplot out: %s: sprintf failed", __func__);
+		g_free(ctx->header);
+		g_free(ctx);
 		return SR_ERR;
 	}
 
 	return 0;
 }
 
-static int event(struct sr_output *o, int event_type, char **data_out,
+static int event(struct sr_output *o, int event_type, uint8_t **data_out,
 		 uint64_t *length_out)
 {
-	struct context *ctx;
-
 	if (!o) {
-		sr_warn("gnuplot out: %s: o was NULL", __func__);
+		sr_err("gnuplot out: %s: o was NULL", __func__);
 		return SR_ERR_ARG;
 	}
 
 	if (!data_out) {
-		sr_warn("gnuplot out: %s: data_out was NULL", __func__);
+		sr_err("gnuplot out: %s: data_out was NULL", __func__);
 		return SR_ERR_ARG;
 	}
 
 	if (!length_out) {
-		sr_warn("gnuplot out: %s: length_out was NULL", __func__);
+		sr_err("gnuplot out: %s: length_out was NULL", __func__);
 		return SR_ERR_ARG;
 	}
 
-	ctx = o->internal;
-
 	switch (event_type) {
 	case SR_DF_TRIGGER:
 		/* TODO: Can a trigger mark be in a gnuplot data file? */
 		break;
 	case SR_DF_END:
-		free(o->internal);
+		g_free(o->internal);
 		o->internal = NULL;
 		break;
 	default:
-		sr_warn("gnuplot out: %s: unsupported event type: %d",
-			__func__, event_type);
+		sr_err("gnuplot out: %s: unsupported event type: %d",
+		       __func__, event_type);
 		break;
 	}
 
@@ -189,37 +183,37 @@ static int event(struct sr_output *o, int event_type, char **data_out,
 	return SR_OK;
 }
 
-static int data(struct sr_output *o, const char *data_in, uint64_t length_in,
-		char **data_out, uint64_t *length_out)
+static int data(struct sr_output *o, const 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, old_sample = 0;
-	char *outbuf, *c;
+	uint8_t *outbuf, *c;
 
 	if (!o) {
-		sr_warn("gnuplot out: %s: o was NULL", __func__);
+		sr_err("gnuplot out: %s: o was NULL", __func__);
 		return SR_ERR_ARG;
 	}
 
 	if (!o->internal) {
-		sr_warn("gnuplot out: %s: o->internal was NULL", __func__);
+		sr_err("gnuplot out: %s: o->internal was NULL", __func__);
 		return SR_ERR_ARG;
 	}
 
 	if (!data_in) {
-		sr_warn("gnuplot out: %s: data_in was NULL", __func__);
+		sr_err("gnuplot out: %s: data_in was NULL", __func__);
 		return SR_ERR_ARG;
 	}
 
 	if (!data_out) {
-		sr_warn("gnuplot out: %s: data_out was NULL", __func__);
+		sr_err("gnuplot out: %s: data_out was NULL", __func__);
 		return SR_ERR_ARG;
 	}
 
 	if (!length_out) {
-		sr_warn("gnuplot out: %s: length_out was NULL", __func__);
+		sr_err("gnuplot out: %s: length_out was NULL", __func__);
 		return SR_ERR_ARG;
 	}
 
@@ -229,16 +223,16 @@ static int data(struct sr_output *o, const char *data_in, uint64_t length_in,
 	if (ctx->header)
 		outsize += strlen(ctx->header);
 
-	if (!(outbuf = calloc(1, outsize))) {
-		sr_warn("gnuplot out: %s: outbuf calloc failed", __func__);
+	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);
-		free(ctx->header);
+		strncpy((char *)outbuf, ctx->header, outsize);
+		g_free(ctx->header);
 		ctx->header = NULL;
 	}
 
@@ -257,27 +251,27 @@ static int data(struct sr_output *o, const char *data_in, uint64_t length_in,
 		old_sample = sample;
 
 		/* The first column is a counter (needed for gnuplot). */
-		c = outbuf + strlen(outbuf);
-		sprintf(c, "%" PRIu64 "\t", samplecount++);
+		c = outbuf + strlen((const char *)outbuf);
+		sprintf((char *)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);
+			c = outbuf + strlen((const char *)outbuf);
+			sprintf((char *)c, "%d ", curbit);
 		}
 
-		c = outbuf + strlen(outbuf);
-		sprintf(c, "\n");
+		c = outbuf + strlen((const char *)outbuf);
+		sprintf((char *)c, "\n");
 	}
 
 	*data_out = outbuf;
-	*length_out = strlen(outbuf);
+	*length_out = strlen((const char *)outbuf);
 
 	return SR_OK;
 }
 
-struct sr_output_format output_gnuplot = {
+SR_PRIV struct sr_output_format output_gnuplot = {
 	.id = "gnuplot",
 	.description = "Gnuplot",
 	.df_type = SR_DF_LOGIC,
@@ -300,17 +294,20 @@ static int analog_init(struct sr_output *o)
 	char wbuf[1000], comment[128];
 	time_t t;
 
-	if (!(ctx = calloc(1, sizeof(struct context))))
+	if (!(ctx = g_try_malloc0(sizeof(struct context)))) {
+		sr_err("gnuplot out: %s: ctx malloc failed", __func__);
 		return SR_ERR_MALLOC;
+	}
 
-	if (!(ctx->header = calloc(1, MAX_HEADER_LEN + 1))) {
-		free(ctx);
+	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->device->probes; l; l = l->next) {
+	for (l = o->dev->probes; l; l = l->next) {
 		probe = l->data;
 		if (!probe->enabled)
 			continue;
@@ -321,19 +318,19 @@ static int analog_init(struct sr_output *o)
 	ctx->unitsize = sizeof(struct sr_analog_sample) +
 			(ctx->num_enabled_probes * sizeof(struct sr_analog_probe));
 
-	num_probes = g_slist_length(o->device->probes);
+	num_probes = g_slist_length(o->dev->probes);
 	comment[0] = '\0';
-	if (o->device->plugin && sr_device_has_hwcap(o->device, SR_HWCAP_SAMPLERATE)) {
-		samplerate = *((uint64_t *) o->device->plugin->get_device_info(
-				o->device->plugin_index, SR_DI_CUR_SAMPLERATE));
+	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))) {
-			free(ctx->header);
-			free(ctx);
+			g_free(ctx->header);
+			g_free(ctx);
 			return SR_ERR;
 		}
 		snprintf(comment, 127, gnuplot_header_comment,
 			ctx->num_enabled_probes, num_probes, frequency_s);
-		free(frequency_s);
+		g_free(frequency_s);
 	}
 
 	/* Columns / channels */
@@ -344,33 +341,34 @@ static int analog_init(struct sr_output *o)
 	}
 
 	if (!(frequency_s = sr_period_string(samplerate))) {
-		free(ctx->header);
-		free(ctx);
+		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);
-	free(frequency_s);
+	g_free(frequency_s);
 
 	if (b < 0) {
-		free(ctx->header);
-		free(ctx);
+		g_free(ctx->header);
+		g_free(ctx);
 		return SR_ERR;
 	}
 
 	return 0;
 }
 
-static int analog_data(struct sr_output *o, char *data_in, uint64_t length_in,
-		char **data_out, uint64_t *length_out)
+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;
-	char *outbuf, *c;
+	uint8_t *outbuf, *c;
 	struct sr_analog_sample *sample;
 
 	ctx = o->internal;
@@ -380,14 +378,16 @@ static int analog_data(struct sr_output *o, char *data_in, uint64_t length_in,
 	if (ctx->header)
 		outsize += strlen(ctx->header);
 
-	if (!(outbuf = calloc(1, outsize)))
+	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);
-		free(ctx->header);
+		g_free(ctx->header);
 		ctx->header = NULL;
 	}