]> sigrok.org Git - libsigrok.git/commitdiff
hex: fix for big-endian architectures.
authorMartin Ling <redacted>
Fri, 26 Apr 2013 20:17:36 +0000 (21:17 +0100)
committerBert Vermeulen <redacted>
Fri, 26 Apr 2013 20:56:16 +0000 (22:56 +0200)
output/text/hex.c

index f1529860a9f430035ab5e488ff40bb637f784de3..c5d1270884db461858ddabfd11ca1c02c4f9921e 100644 (file)
@@ -46,7 +46,7 @@ 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;
@@ -71,10 +71,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);
+               sample = data_in + offset;
                for (p = 0; p < ctx->num_enabled_probes; 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]);