X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Fgnuplot.c;h=d57e6847f645c5232da5b3a26801469505f7d9e8;hb=8489264f1e3ef07ba8f1143ed62fa88d90980f94;hp=ecbc027b05a38194e08d54d426bda5a6e76db10e;hpb=5097b0d0912165429aceddb5febbf68467b623f5;p=libsigrok.git

diff --git a/output/gnuplot.c b/output/gnuplot.c
index ecbc027b..d57e6847 100644
--- a/output/gnuplot.c
+++ b/output/gnuplot.c
@@ -71,8 +71,8 @@ static int init(struct sr_output *o)
 		return SR_ERR_ARG;
 	}
 
-	if (!o->dev->plugin) {
-		sr_err("gnuplot out: %s: o->dev->plugin was NULL", __func__);
+	if (!o->dev->driver) {
+		sr_err("gnuplot out: %s: o->dev->driver was NULL", __func__);
 		return SR_ERR_ARG;
 	}
 
@@ -101,8 +101,8 @@ static int init(struct sr_output *o)
 	num_probes = g_slist_length(o->dev->probes);
 	comment[0] = '\0';
 	if (sr_dev_has_hwcap(o->dev, SR_HWCAP_SAMPLERATE)) {
-		samplerate = *((uint64_t *) o->dev->plugin->dev_info_get(
-				o->dev->plugin_index, SR_DI_CUR_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))) {
 			sr_err("gnuplot out: %s: sr_samplerate_string failed",
 			       __func__);
@@ -118,7 +118,7 @@ static int init(struct sr_output *o)
 	/* 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]);
 	}
 
@@ -145,11 +145,9 @@ static int init(struct sr_output *o)
 	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_err("gnuplot out: %s: o was NULL", __func__);
 		return SR_ERR_ARG;
@@ -165,8 +163,6 @@ static int event(struct sr_output *o, int event_type, char **data_out,
 		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? */
@@ -187,14 +183,14 @@ 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_err("gnuplot out: %s: o was NULL", __func__);
@@ -235,7 +231,7 @@ static int data(struct sr_output *o, const char *data_in, uint64_t length_in,
 	outbuf[0] = '\0';
 	if (ctx->header) {
 		/* The header is still here, this must be the first packet. */
-		strncpy(outbuf, ctx->header, outsize);
+		strncpy((char *)outbuf, ctx->header, outsize);
 		g_free(ctx->header);
 		ctx->header = NULL;
 	}
@@ -255,22 +251,22 @@ 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;
 }
@@ -324,9 +320,9 @@ static int analog_init(struct sr_output *o)
 
 	num_probes = g_slist_length(o->dev->probes);
 	comment[0] = '\0';
-	if (o->dev->plugin && sr_dev_has_hwcap(o->dev, SR_HWCAP_SAMPLERATE)) {
-		samplerate = *((uint64_t *) o->dev->plugin->dev_info_get(
-				o->dev->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))) {
 			g_free(ctx->header);
 			g_free(ctx);
@@ -364,14 +360,15 @@ static int analog_init(struct sr_output *o)
 	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;