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 9477a7b58e380e38569cc834a72c2c4e58d2f8f6..e976e9ba445b0ef639e50824df4a82949ea974f4 100644 (file)
--- a/output/text/hex.c
+++ b/output/text/hex.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
  * Copyright (C) 2011 Håvard Espeland <gus@ping.uio.no>
@@ -25,6 +25,8 @@
 #include "libsigrok-internal.h"
 #include "text.h"
 
+#define LOG_PREFIX "output/hex"
+
 SR_PRIV int init_hex(struct sr_output *o)
 {
        return init(o, DEFAULT_BPL_HEX, MODE_HEX);
@@ -37,17 +39,17 @@ SR_PRIV int data_hex(struct sr_output *o, const uint8_t *data_in,
        struct context *ctx;
        unsigned int outsize, offset, p;
        int max_linelen;
-       uint64_t sample;
+       const uint8_t *sample;
        uint8_t *outbuf;
 
        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))) {
-               sr_err("hex out: %s: outbuf malloc failed", __func__);
+               sr_err("%s: outbuf malloc failed", __func__);
                return SR_ERR_MALLOC;
        }
 
@@ -62,10 +64,10 @@ SR_PRIV int data_hex(struct sr_output *o, const uint8_t *data_in,
        ctx->line_offset = 0;
        for (offset = 0; offset <= length_in - ctx->unitsize;
             offset += ctx->unitsize) {
-               memcpy(&sample, data_in + offset, ctx->unitsize);
-               for (p = 0; p < ctx->num_enabled_probes; p++) {
+               sample = data_in + offset;
+               for (p = 0; p < ctx->num_enabled_channels; p++) {
                        ctx->linevalues[p] <<= 1;
-                       if (sample & ((uint64_t) 1 << p))
+                       if (sample[p / 8] & ((uint8_t) 1 << (p % 8)))
                                ctx->linevalues[p] |= 1;
                        sprintf((char *)ctx->linebuf + (p * ctx->linebuf_len) +
                                ctx->line_offset, "%.2x", ctx->linevalues[p]);
@@ -74,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;
@@ -100,4 +102,5 @@ SR_PRIV struct sr_output_format output_text_hex = {
        .init = init_hex,
        .data = data_hex,
        .event = event,
+       .cleanup = text_cleanup,
 };