X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Ftext%2Fbits.c;h=0ba9682b110de2c8676aefe84af480ca24b7f7a4;hb=db9679afc9f46bdf038efabd3ac69983d15f89cf;hp=af53e49f43d55a5901b7e98514805267067a9be2;hpb=50985c2019b2b5a6ce394589d89ee925b4f5e3a9;p=libsigrok.git diff --git a/output/text/bits.c b/output/text/bits.c index af53e49f..0ba9682b 100644 --- a/output/text/bits.c +++ b/output/text/bits.c @@ -46,7 +46,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; @@ -70,18 +70,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; }