X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Ftext%2Fhex.c;h=c5d1270884db461858ddabfd11ca1c02c4f9921e;hb=db9679afc9f46bdf038efabd3ac69983d15f89cf;hp=e1ff08c46e0add9b5cf3cdaf22450b45bf29fd03;hpb=a944a84b17c5f5544b45e27dc07d7f60a4fd6ba8;p=libsigrok.git

diff --git a/output/text/hex.c b/output/text/hex.c
index e1ff08c4..c5d12708 100644
--- a/output/text/hex.c
+++ b/output/text/hex.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>
@@ -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]);