A few more random 'probe' to 'channel' changes.

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

diff --git a/output/text/bits.c b/output/text/bits.c
index 55482d45f83571f500a261897168fae0badef73b..4ab59253fb4fb85285bfee84b5e1dd2dd34048fd 100644 (file)
--- a/output/text/bits.c
+++ b/output/text/bits.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,14 +25,7 @@
 #include "libsigrok-internal.h"
 #include "text.h"
 
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "output/bits: "
-#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/bits"
 
 SR_PRIV int init_bits(struct sr_output *o)
 {
@@ -46,18 +39,18 @@ SR_PRIV int data_bits(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, 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__);
@@ -70,18 +63,14 @@ SR_PRIV int data_bits(struct sr_output *o, const uint8_t *data_in,
                strncpy((char *)outbuf, ctx->header, outsize);
                g_free(ctx->header);
                ctx->header = NULL;
-
-               /* Ensure first transition. */
-               memcpy(&ctx->prevsample, data_in, ctx->unitsize);
-               ctx->prevsample = ~ctx->prevsample;
        }
 
        if (length_in >= ctx->unitsize) {
                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++) {
-                               c = (sample & ((uint64_t) 1 << p)) ? '1' : '0';
+                       sample = data_in + offset;
+                       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;
                        }
@@ -90,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++;
@@ -120,4 +109,5 @@ SR_PRIV struct sr_output_format output_text_bits = {
        .init = init_bits,
        .data = data_bits,
        .event = event,
+       .cleanup = text_cleanup,
 };