X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=output%2Ftext%2Fascii.c;h=4a6b4f08a920db9ee0e54fec76a9176f510f3312;hp=147ff60e94586abb5df1dae3619898aa11295442;hb=ba7dd8bbb8168cba432a844259a3e239aa5f36d7;hpb=8c273ac57ce34d5a8c8b5093413564af69968041

diff --git a/output/text/ascii.c b/output/text/ascii.c
index 147ff60e..4a6b4f08 100644
--- a/output/text/ascii.c
+++ b/output/text/ascii.c
@@ -25,14 +25,7 @@
 #include "libsigrok-internal.h"
 #include "text.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "output/ascii: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "output/ascii"
 
 SR_PRIV int init_ascii(struct sr_output *o)
 {
@@ -57,7 +50,7 @@ SR_PRIV int data_ascii(struct sr_output *o, const uint8_t *data_in,
          * 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__);
@@ -77,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)));
@@ -106,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];
 			}