Centralise duplicated logging helper defines.

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

diff --git a/output/text/bits.c b/output/text/bits.c
index 9692ac31947ad961909e93c2cea12f72aa358fd8..ff149650fe9c540789db9a0b5d6c87ef8ddbfadb 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>
@@ -21,10 +21,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include "sigrok.h"
-#include "sigrok-internal.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 #include "text.h"
 
+#define LOG_PREFIX "output/bits"
+
 SR_PRIV int init_bits(struct sr_output *o)
 {
        return init(o, DEFAULT_BPL_BITS, MODE_BITS);
@@ -37,7 +39,7 @@ 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;
@@ -51,7 +53,7 @@ SR_PRIV int data_bits(struct sr_output *o, const uint8_t *data_in,
             * (ctx->num_enabled_probes * max_linelen);
 
        if (!(outbuf = g_try_malloc0(outsize + 1))) {
-               sr_err("bits out: %s: outbuf malloc failed", __func__);
+               sr_err("%s: outbuf malloc failed", __func__);
                return SR_ERR_MALLOC;
        }
 
@@ -61,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);
+                       sample = data_in + offset;
                        for (p = 0; p < ctx->num_enabled_probes; p++) {
-                               c = (sample & ((uint64_t) 1 << p)) ? '1' : '0';
+                               c = (sample[p / 8] & ((uint8_t) 1 << (p % 8))) ? '1' : '0';
                                ctx->linebuf[p * ctx->linebuf_len +
                                             ctx->line_offset] = c;
                        }
@@ -95,8 +93,7 @@ SR_PRIV int data_bits(struct sr_output *o, const uint8_t *data_in,
                        }
                }
        } else {
-               sr_info("bits out: short buffer (length_in=%" PRIu64 ")",
-                       length_in);
+               sr_info("Short buffer (length_in=%" PRIu64 ").", length_in);
        }
 
        *data_out = outbuf;
@@ -112,4 +109,5 @@ SR_PRIV struct sr_output_format output_text_bits = {
        .init = init_bits,
        .data = data_bits,
        .event = event,
+       .cleanup = text_cleanup,
 };