X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Foutput_gnuplot.c;h=43033777f4ee2abe1649c89b369f653fe4b4384f;hb=c91404191e6b31ffe40edd8de469876a02c81d57;hp=18e7631811d36ebf352148d1823cd560aba8feed;hpb=77b454421a2aa7d52873f036e5ba5f8030fe29a3;p=libsigrok.git

diff --git a/output/output_gnuplot.c b/output/output_gnuplot.c
index 18e76318..43033777 100644
--- a/output/output_gnuplot.c
+++ b/output/output_gnuplot.c
@@ -27,11 +27,13 @@
 struct context {
 	unsigned int num_enabled_probes;
 	unsigned int unitsize;
-	char *probelist[MAX_NUM_PROBES+1];
+	char *probelist[SR_MAX_NUM_PROBES + 1];
 	char *header;
 };
 
-#define MAX_HEADER_LEN   1024 + (MAX_NUM_PROBES * (MAX_PROBENAME_LEN + 10))
+#define MAX_HEADER_LEN \
+	(1024 + (SR_MAX_NUM_PROBES * (SR_MAX_PROBENAME_LEN + 10)))
+
 const char *gnuplot_header = "\
 # Sample data in space-separated columns format usable by gnuplot\n\
 #\n\
@@ -141,7 +143,7 @@ static int event(struct sr_output *o, int event_type, char **data_out,
 	return SR_OK;
 }
 
-static int data(struct sr_output *o, char *data_in, uint64_t length_in,
+static int data(struct sr_output *o, const char *data_in, uint64_t length_in,
 		char **data_out, uint64_t *length_out)
 {
 	struct context *ctx;
@@ -232,8 +234,8 @@ static int analog_init(struct sr_output *o)
 	}
 	ctx->probelist[ctx->num_enabled_probes] = 0;
 //	ctx->unitsize = (ctx->num_enabled_probes + 7) / 8;
-	ctx->unitsize = sizeof(struct analog_sample) +
-			(ctx->num_enabled_probes * sizeof(struct analog_probe));
+	ctx->unitsize = sizeof(struct sr_analog_sample) +
+			(ctx->num_enabled_probes * sizeof(struct sr_analog_probe));
 
 	num_probes = g_slist_length(o->device->probes);
 	comment[0] = '\0';
@@ -285,7 +287,7 @@ static int analog_data(struct sr_output *o, char *data_in, uint64_t length_in,
 //	uint64_t sample;
 	static uint64_t samplecount = 0;
 	char *outbuf, *c;
-	struct analog_sample *sample;
+	struct sr_analog_sample *sample;
 
 	ctx = o->internal;
 //	max_linelen = 16 + ctx->num_enabled_probes * 2;
@@ -307,7 +309,7 @@ static int analog_data(struct sr_output *o, char *data_in, uint64_t length_in,
 
 	for (i = 0; i <= length_in - ctx->unitsize; i += ctx->unitsize) {
 //		memcpy(&sample, data_in + i, ctx->unitsize);
-		sample = (struct analog_sample *) (data_in + i);
+		sample = (struct sr_analog_sample *) (data_in + i);
 
 		/* The first column is a counter (needed for gnuplot). */
 		c = outbuf + strlen(outbuf);