X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Foutput_text.c;h=3c3fbb5046229120607520c19a9d3928c0b49345;hb=1fdb75e14528abd62ebe727537512c741a5759da;hp=621729b7d25b123ee5f18f01ef9e57bde26c6d0e;hpb=339729131d5acd50147e26ec238db569e273a459;p=libsigrok.git

diff --git a/output/output_text.c b/output/output_text.c
index 621729b7..3c3fbb50 100644
--- a/output/output_text.c
+++ b/output/output_text.c
@@ -69,7 +69,6 @@ static void flush_linebufs(struct context *ctx, char *outbuf)
 			ctx->mark_trigger + (ctx->mark_trigger / 8), "");
 
 	memset(ctx->linebuf, 0, i * ctx->linebuf_len);
-
 }
 
 static int init(struct output *o, int default_spl)
@@ -89,8 +88,9 @@ static int init(struct output *o, int default_spl)
 
 	for (l = o->device->probes; l; l = l->next) {
 		probe = l->data;
-		if (probe->enabled)
-			ctx->probelist[ctx->num_enabled_probes++] = probe->name;
+		if (!probe->enabled)
+			continue;
+		ctx->probelist[ctx->num_enabled_probes++] = probe->name;
 	}
 
 	ctx->probelist[ctx->num_enabled_probes] = 0;
@@ -183,11 +183,13 @@ static int data_bits(struct output *o, char *data_in, uint64_t length_in,
 	unsigned int outsize, offset, p;
 	int max_linelen;
 	uint64_t sample;
-	char *outbuf;
+	char *outbuf, c;
 
 	ctx = o->internal;
-	max_linelen = MAX_PROBENAME_LEN + 3 + ctx->samples_per_line + ctx->samples_per_line / 8;
-	outsize = length_in / ctx->unitsize * ctx->num_enabled_probes / ctx->samples_per_line * max_linelen + 512;
+	max_linelen = MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
+			+ ctx->samples_per_line / 8;
+	outsize = length_in / ctx->unitsize * ctx->num_enabled_probes
+			/ ctx->samples_per_line * max_linelen + 512;
 
 	if (!(outbuf = calloc(1, outsize + 1)))
 		return SIGROK_ERR_MALLOC;
@@ -205,12 +207,9 @@ static int data_bits(struct output *o, char *data_in, uint64_t length_in,
 		     offset += ctx->unitsize) {
 			memcpy(&sample, data_in + offset, ctx->unitsize);
 			for (p = 0; p < ctx->num_enabled_probes; p++) {
-				if (sample & ((uint64_t) 1 << p))
-					ctx->linebuf[p * ctx->linebuf_len +
-						     ctx->line_offset] = '1';
-				else
-					ctx->linebuf[p * ctx->linebuf_len +
-						     ctx->line_offset] = '0';
+				c = (sample & ((uint64_t) 1 << p)) ? '1' : '0';
+				ctx->linebuf[p * ctx->linebuf_len +
+					     ctx->line_offset] = c;
 			}
 			ctx->line_offset++;
 			ctx->spl_cnt++;
@@ -255,8 +254,10 @@ static int data_hex(struct output *o, char *data_in, uint64_t length_in,
 	char *outbuf;
 
 	ctx = o->internal;
-	max_linelen = MAX_PROBENAME_LEN + 3 + ctx->samples_per_line + ctx->samples_per_line / 2;
-	outsize = length_in / ctx->unitsize * ctx->num_enabled_probes / ctx->samples_per_line * max_linelen + 512;
+	max_linelen = MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
+			+ ctx->samples_per_line / 2;
+	outsize = length_in / ctx->unitsize * ctx->num_enabled_probes
+			/ ctx->samples_per_line * max_linelen + 512;
 
 	if (!(outbuf = calloc(1, outsize + 1)))
 		return SIGROK_ERR_MALLOC;
@@ -305,7 +306,8 @@ static int data_hex(struct output *o, char *data_in, uint64_t length_in,
 
 struct output_format output_text_bits = {
 	"bits",
-	"Text (bits)",
+	"Bits (takes argument, default 64)",
+	DF_LOGIC,
 	init_bits,
 	data_bits,
 	event,
@@ -313,7 +315,8 @@ struct output_format output_text_bits = {
 
 struct output_format output_text_hex = {
 	"hex",
-	"Text (hexadecimal)",
+	"Hexadecimal (takes argument, default 256)",
+	DF_LOGIC,
 	init_hex,
 	data_hex,
 	event,