Centralise duplicated logging helper defines.

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

diff --git a/output/text/ascii.c b/output/text/ascii.c
index dd4373f46d574822712039c33470f30b2cc2fc5b..61c5a2ad2db863aceb913b3f668b4dec1cb19b03 100644 (file)
--- a/output/text/ascii.c
+++ b/output/text/ascii.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/ascii"
+
 SR_PRIV int init_ascii(struct sr_output *o)
 {
        return init(o, DEFAULT_BPL_ASCII, MODE_ASCII);
@@ -37,7 +39,7 @@ SR_PRIV int data_ascii(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;
@@ -51,7 +53,7 @@ SR_PRIV int data_ascii(struct sr_output *o, const uint8_t *data_in,
             * (ctx->num_enabled_probes * max_linelen);
 
        if (!(outbuf = g_try_malloc0(outsize + 1))) {
-               sr_err("ascii out: %s: outbuf malloc failed", __func__);
+               sr_err("%s: outbuf malloc failed", __func__);
                return SR_ERR_MALLOC;
        }
 
@@ -66,14 +68,14 @@ SR_PRIV int data_ascii(struct sr_output *o, const uint8_t *data_in,
        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;
 
                        char tmpval[ctx->num_enabled_probes];
 
                        for (p = 0; p < ctx->num_enabled_probes; p++) {
-                               uint64_t curbit = (sample & ((uint64_t) 1 << p));
-                               uint64_t prevbit = (ctx->prevsample &
-                                               ((uint64_t) 1 << p));
+                               uint8_t curbit = (sample[p / 8] & ((uint8_t) 1 << (p % 8)));
+                               uint8_t prevbit = (ctx->prevsample[p / 8] &
+                                               ((uint8_t) 1 << (p % 8)));
 
                                if (curbit < prevbit && ctx->line_offset > 0) {
                                        ctx->linebuf[p * ctx->linebuf_len +
@@ -105,11 +107,10 @@ SR_PRIV int data_ascii(struct sr_output *o, const uint8_t *data_in,
                        ctx->line_offset++;
                        ctx->spl_cnt++;
 
-                       ctx->prevsample = sample;
+                       memcpy(ctx->prevsample, sample, ctx->unitsize);
                }
        } else {
-               sr_info("ascii out: short buffer (length_in=%" PRIu64 ")",
-                       length_in);
+               sr_info("Short buffer (length_in=%" PRIu64 ").", length_in);
        }
 
        *data_out = outbuf;
@@ -125,4 +126,5 @@ SR_PRIV struct sr_output_format output_text_ascii = {
        .init = init_ascii,
        .data = data_ascii,
        .event = event,
+       .cleanup = text_cleanup,
 };