X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=output%2Ftext%2Fascii.c;h=3b3bcc72a28402db4e00fa35f17b81232b1209d8;hb=fca75cbb741ae756bf50eaf1cdc6d4d53fcc60cd;hp=61c5a2ad2db863aceb913b3f668b4dec1cb19b03;hpb=3544f848e0d7f67af8e11ce7ec344b34cd797df3;p=libsigrok.git

diff --git a/output/text/ascii.c b/output/text/ascii.c
index 61c5a2ad..3b3bcc72 100644
--- a/output/text/ascii.c
+++ b/output/text/ascii.c
@@ -43,14 +43,14 @@ SR_PRIV int data_ascii(struct sr_output *o, const uint8_t *data_in,
 	uint8_t *outbuf;
 
 	ctx = o->internal;
-	max_linelen = SR_MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
+	max_linelen = SR_MAX_CHANNELNAME_LEN + 3 + ctx->samples_per_line
 			+ ctx->samples_per_line / 8;
         /*
-         * Calculate space needed for probes. Set aside 512 bytes for
+         * Calculate space needed for channels. Set aside 512 bytes for
          * extra output, e.g. trigger.
          */
 	outsize = 512 + (1 + (length_in / ctx->unitsize) / ctx->samples_per_line)
-            * (ctx->num_enabled_probes * max_linelen);
+            * (ctx->num_enabled_channels * max_linelen);
 
 	if (!(outbuf = g_try_malloc0(outsize + 1))) {
 		sr_err("%s: outbuf malloc failed", __func__);
@@ -70,9 +70,9 @@ SR_PRIV int data_ascii(struct sr_output *o, const uint8_t *data_in,
 		     offset += ctx->unitsize) {
 			sample = data_in + offset;
 
-			char tmpval[ctx->num_enabled_probes];
+			char tmpval[ctx->num_enabled_channels];
 
-			for (p = 0; p < ctx->num_enabled_probes; p++) {
+			for (p = 0; p < ctx->num_enabled_channels; p++) {
 				uint8_t curbit = (sample[p / 8] & ((uint8_t) 1 << (p % 8)));
 				uint8_t prevbit = (ctx->prevsample[p / 8] &
 						((uint8_t) 1 << (p % 8)));
@@ -99,7 +99,7 @@ SR_PRIV int data_ascii(struct sr_output *o, const uint8_t *data_in,
 				ctx->mark_trigger = -1;
 			}
 
-			for (p = 0; p < ctx->num_enabled_probes; p++) {
+			for (p = 0; p < ctx->num_enabled_channels; p++) {
 				ctx->linebuf[p * ctx->linebuf_len +
 					     ctx->line_offset] = tmpval[p];
 			}