X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=output%2Ftext%2Fbits.c;h=4ab59253fb4fb85285bfee84b5e1dd2dd34048fd;hp=3afb90169104eaa20037b709378871fc4a054347;hb=fca75cbb741ae756bf50eaf1cdc6d4d53fcc60cd;hpb=29a27196a13de2ffd9b671185e4b464b9db9b549

diff --git a/output/text/bits.c b/output/text/bits.c
index 3afb9016..4ab59253 100644
--- a/output/text/bits.c
+++ b/output/text/bits.c
@@ -25,14 +25,7 @@
 #include "libsigrok-internal.h"
 #include "text.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "output/bits: "
-#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/bits"
 
 SR_PRIV int init_bits(struct sr_output *o)
 {
@@ -50,14 +43,14 @@ SR_PRIV int data_bits(struct sr_output *o, const uint8_t *data_in,
 	uint8_t *outbuf, c;
 
 	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__);
@@ -76,7 +69,7 @@ SR_PRIV int data_bits(struct sr_output *o, const uint8_t *data_in,
 		for (offset = 0; offset <= length_in - ctx->unitsize;
 		     offset += ctx->unitsize) {
 			sample = data_in + offset;
-			for (p = 0; p < ctx->num_enabled_probes; p++) {
+			for (p = 0; p < ctx->num_enabled_channels; p++) {
 				c = (sample[p / 8] & ((uint8_t) 1 << (p % 8))) ? '1' : '0';
 				ctx->linebuf[p * ctx->linebuf_len +
 					     ctx->line_offset] = c;
@@ -86,7 +79,7 @@ SR_PRIV int data_bits(struct sr_output *o, const uint8_t *data_in,
 
 			/* Add a space every 8th bit. */
 			if ((ctx->spl_cnt & 7) == 0) {
-				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] = ' ';
 				ctx->line_offset++;
@@ -116,4 +109,5 @@ SR_PRIV struct sr_output_format output_text_bits = {
 	.init = init_bits,
 	.data = data_bits,
 	.event = event,
+	.cleanup = text_cleanup,
 };