X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Ftext%2Fascii.c;h=61c5a2ad2db863aceb913b3f668b4dec1cb19b03;hb=3544f848e0d7f67af8e11ce7ec344b34cd797df3;hp=2fed35d8b4e9e2515059f9012c23efe4565ce678;hpb=a944a84b17c5f5544b45e27dc07d7f60a4fd6ba8;p=libsigrok.git

diff --git a/output/text/ascii.c b/output/text/ascii.c
index 2fed35d8..61c5a2ad 100644
--- a/output/text/ascii.c
+++ b/output/text/ascii.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>
@@ -25,14 +25,7 @@
 #include "libsigrok-internal.h"
 #include "text.h"
 
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "output/ascii: "
-#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)
+#define LOG_PREFIX "output/ascii"
 
 SR_PRIV int init_ascii(struct sr_output *o)
 {
@@ -46,7 +39,7 @@ SR_PRIV int data_ascii(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;
@@ -75,14 +68,14 @@ SR_PRIV int data_ascii(struct sr_output *o, const uint8_t *data_in,
 	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;
 
 			char tmpval[ctx->num_enabled_probes];
 
 			for (p = 0; p < ctx->num_enabled_probes; p++) {
-				uint64_t curbit = (sample & ((uint64_t) 1 << p));
-				uint64_t prevbit = (ctx->prevsample &
-						((uint64_t) 1 << p));
+				uint8_t curbit = (sample[p / 8] & ((uint8_t) 1 << (p % 8)));
+				uint8_t prevbit = (ctx->prevsample[p / 8] &
+						((uint8_t) 1 << (p % 8)));
 
 				if (curbit < prevbit && ctx->line_offset > 0) {
 					ctx->linebuf[p * ctx->linebuf_len +
@@ -114,7 +107,7 @@ SR_PRIV int data_ascii(struct sr_output *o, const uint8_t *data_in,
 			ctx->line_offset++;
 			ctx->spl_cnt++;
 
-			ctx->prevsample = sample;
+			memcpy(ctx->prevsample, sample, ctx->unitsize);
 		}
 	} else {
 		sr_info("Short buffer (length_in=%" PRIu64 ").", length_in);
@@ -133,4 +126,5 @@ SR_PRIV struct sr_output_format output_text_ascii = {
 	.init = init_ascii,
 	.data = data_ascii,
 	.event = event,
+	.cleanup = text_cleanup,
 };