Replace 'probe' with 'channel' in most places.

[libsigrok.git] / output / text / hex.c

diff --git a/output/text/hex.c b/output/text/hex.c
index c5d1270884db461858ddabfd11ca1c02c4f9921e..e976e9ba445b0ef639e50824df4a82949ea974f4 100644 (file)
--- a/output/text/hex.c
+++ b/output/text/hex.c
@@ -25,14 +25,7 @@
 #include "libsigrok-internal.h"
 #include "text.h"
 
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "output/hex: "
-#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
-#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+#define LOG_PREFIX "output/hex"
 
 SR_PRIV int init_hex(struct sr_output *o)
 {
@@ -52,7 +45,7 @@ SR_PRIV int data_hex(struct sr_output *o, const uint8_t *data_in,
        ctx = o->internal;
        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
+       outsize = length_in / ctx->unitsize * ctx->num_enabled_channels
                        / ctx->samples_per_line * max_linelen + 512;
 
        if (!(outbuf = g_try_malloc0(outsize + 1))) {
@@ -72,7 +65,7 @@ SR_PRIV int data_hex(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++) {
                        ctx->linevalues[p] <<= 1;
                        if (sample[p / 8] & ((uint8_t) 1 << (p % 8)))
                                ctx->linevalues[p] |= 1;
@@ -83,7 +76,7 @@ SR_PRIV int data_hex(struct sr_output *o, const uint8_t *data_in,
 
                /* Add a space after every complete hex byte. */
                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 + 2] = ' ';
                        ctx->line_offset += 3;
@@ -109,4 +102,5 @@ SR_PRIV struct sr_output_format output_text_hex = {
        .init = init_hex,
        .data = data_hex,
        .event = event,
+       .cleanup = text_cleanup,
 };