s/DRIVER_LOG_DOMAIN/LOG_PREFIX/.

[libsigrok.git] / output / text / hex.c

diff --git a/output/text/hex.c b/output/text/hex.c
index f1529860a9f430035ab5e488ff40bb637f784de3..3ddaf47fc6c20eee48f533290ece3a8289aeb7f8 100644 (file)
--- a/output/text/hex.c
+++ b/output/text/hex.c
@@ -25,14 +25,14 @@
 #include "libsigrok-internal.h"
 #include "text.h"
 
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "output/hex: "
-#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
-#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+/* Message logging helpers with subsystem-specific prefix string. */
+#define LOG_PREFIX "output/hex: "
+#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
+#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
+#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
+#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
+#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
+#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
 
 SR_PRIV int init_hex(struct sr_output *o)
 {
@@ -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]);