X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Foutput_analog.c;h=0f60dd35795912fc2a775eae30d0546ef27d84b7;hb=d078d2e5f3842b1915ffa9961654f3aa4ed88e17;hp=94bd8d8d23f034dc236d0274f8f381c8c904a285;hpb=809c5f2011198a064a2e5e4028f19e63eb532ec1;p=libsigrok.git

diff --git a/output/output_analog.c b/output/output_analog.c
index 94bd8d8d..0f60dd35 100644
--- a/output/output_analog.c
+++ b/output/output_analog.c
@@ -202,8 +202,8 @@ static int init_bits(struct sr_output *o)
 	return init(o, DEFAULT_BPL_BITS, MODE_BITS);
 }
 
-static int data_bits(struct sr_output *o, char *data_in, uint64_t length_in,
-		     char **data_out, uint64_t *length_out)
+static int data_bits(struct sr_output *o, const char *data_in,
+		     uint64_t length_in, char **data_out, uint64_t *length_out)
 {
 	struct context *ctx;
 	unsigned int outsize, offset, p;
@@ -212,7 +212,7 @@ static int data_bits(struct sr_output *o, char *data_in, uint64_t length_in,
 	char *outbuf, c;
 
 	ctx = o->internal;
-	max_linelen = MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
+	max_linelen = SR_MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
 			+ ctx->samples_per_line / 8;
         /*
          * Calculate space needed for probes. Set aside 512 bytes for
@@ -288,8 +288,8 @@ static int init_hex(struct sr_output *o)
 	return init(o, DEFAULT_BPL_HEX, MODE_HEX);
 }
 
-static int data_hex(struct sr_output *o, char *data_in, uint64_t length_in,
-		    char **data_out, uint64_t *length_out)
+static int data_hex(struct sr_output *o, const char *data_in,
+		    uint64_t length_in, char **data_out, uint64_t *length_out)
 {
 	struct context *ctx;
 	unsigned int outsize, offset, p;
@@ -298,7 +298,7 @@ static int data_hex(struct sr_output *o, char *data_in, uint64_t length_in,
 	char *outbuf;
 
 	ctx = o->internal;
-	max_linelen = MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
+	max_linelen = SR_MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
 			+ ctx->samples_per_line / 2;
 	outsize = length_in / ctx->unitsize * ctx->num_enabled_probes
 			/ ctx->samples_per_line * max_linelen + 512;
@@ -353,8 +353,8 @@ static int init_ascii(struct sr_output *o)
 	return init(o, DEFAULT_BPL_ASCII, MODE_ASCII);
 }
 
-static int data_ascii(struct sr_output *o, char *data_in, uint64_t length_in,
-		     char **data_out, uint64_t *length_out)
+static int data_ascii(struct sr_output *o, const char *data_in,
+		      uint64_t length_in, char **data_out, uint64_t *length_out)
 {
 	struct context *ctx;
 	unsigned int outsize, offset, p;
@@ -363,7 +363,7 @@ static int data_ascii(struct sr_output *o, char *data_in, uint64_t length_in,
 	char *outbuf;
 
 	ctx = o->internal;
-	max_linelen = MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
+	max_linelen = SR_MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
 			+ ctx->samples_per_line / 8;
         /*
          * Calculate space needed for probes. Set aside 512 bytes for