ascii: fix for big-endian architectures.

diff --git a/output/text/ascii.c b/output/text/ascii.c
index ab3c7f12c77a564269b48454bbafc48a17be9d4e..f93e3b813174b2e7fbe65969f0738c798401da24 100644 (file)
--- a/output/text/ascii.c
+++ b/output/text/ascii.c
@@ -46,7 +46,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;
@@ -75,14 +75,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 +
@@ -114,7 +114,7 @@ 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("Short buffer (length_in=%" PRIu64 ").", length_in);

diff --git a/output/text/text.c b/output/text/text.c
index 30e04696db3534816c663e02ee080b6e7a033e4d..674fa8867e3eb492263b6131c86da5e2a4cc627d 100644 (file)
--- a/output/text/text.c
+++ b/output/text/text.c
@@ -154,6 +154,12 @@ SR_PRIV int init(struct sr_output *o, int default_spl, enum outputmode mode)
                ret = SR_ERR_MALLOC;
        }
 
+       if (mode == MODE_ASCII &&
+                       !(ctx->prevsample = g_try_malloc0(num_probes / 8))) {
+               sr_err("%s: ctx->prevsample malloc failed", __func__);
+               ret = SR_ERR_MALLOC;
+       }
+
 err:
        if (ret != SR_OK) {
                g_free(ctx->header);

diff --git a/output/text/text.h b/output/text/text.h
index 78ef4783549ac19f454e611d784587c5c36fca3e..f3ada90dc23ae3af3ae7b91865aa7740e683c087 100644 (file)
--- a/output/text/text.h
+++ b/output/text/text.h
@@ -42,7 +42,7 @@ struct context {
        uint8_t *linevalues;
        char *header;
        int mark_trigger;
-       uint64_t prevsample;
+       uint8_t *prevsample;
        enum outputmode mode;
 };