BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hex: fix for big-endian architectures.

This commit is contained in:
Martin Ling 2013-04-26 21:17:36 +01:00 committed by Bert Vermeulen
parent 542dbd185b
commit 9275d23208
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
output/text/hex.c
View File

@ -46,7 +46,7 @@ SR_PRIV int data_hex(struct sr_output *o, const uint8_t *data_in,
struct context *ctx; struct context *ctx;
unsigned int outsize, offset, p; unsigned int outsize, offset, p;
int max_linelen; int max_linelen;
uint64_t sample; const uint8_t *sample;
uint8_t *outbuf; uint8_t *outbuf;
ctx = o->internal; 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; ctx->line_offset = 0;
for (offset = 0; offset <= length_in - ctx->unitsize; for (offset = 0; offset <= length_in - ctx->unitsize;
offset += 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++) { for (p = 0; p < ctx->num_enabled_probes; p++) {
ctx->linevalues[p] <<= 1; ctx->linevalues[p] <<= 1;
if (sample & ((uint64_t) 1 << p)) if (sample[p / 8] & ((uint8_t) 1 << (p % 8)))
ctx->linevalues[p] |= 1; ctx->linevalues[p] |= 1;
sprintf((char *)ctx->linebuf + (p * ctx->linebuf_len) + sprintf((char *)ctx->linebuf + (p * ctx->linebuf_len) +
ctx->line_offset, "%.2x", ctx->linevalues[p]); ctx->line_offset, "%.2x", ctx->linevalues[p]);