X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Foutput_text.c;h=a549e1f6b4053e061c1b209eaaba92be49b35fb1;hb=1c5b9d302c410cdd1cba441f618e0e3f7afa137d;hp=ae7a75a914b23720afcbe3a787e981b2c7c4c315;hpb=25e7d9b115e5ea08be2d92ffe286aa1bf95778f4;p=libsigrok.git

diff --git a/output/output_text.c b/output/output_text.c
index ae7a75a9..a549e1f6 100644
--- a/output/output_text.c
+++ b/output/output_text.c
@@ -27,9 +27,9 @@
 #define DEFAULT_BPL_HEX 256
 
 struct context {
-	int num_enabled_probes;
+	unsigned int num_enabled_probes;
 	int samples_per_line;
-	int unitsize;
+	unsigned int unitsize;
 	int line_offset;
 	int linebuf_len;
 	char *probelist[65];
@@ -40,7 +40,7 @@ struct context {
 };
 
 
-static void flush_linebufs(struct context *ctx, GSList *probes, char *outbuf)
+static void flush_linebufs(struct context *ctx, char *outbuf)
 {
 	static int max_probename_len = 0;
 	int len, i;
@@ -123,7 +123,7 @@ static int event(struct output *o, int event_type, char **data_out, uint64_t *le
 	case DF_END:
 		outsize = ctx->num_enabled_probes * (ctx->samples_per_line + 20) + 512;
 		outbuf = calloc(1, outsize);
-		flush_linebufs(ctx, o->device->probes, outbuf);
+		flush_linebufs(ctx, outbuf);
 		*data_out = outbuf;
 		*length_out = strlen(outbuf);
 		free(o->internal);
@@ -146,12 +146,12 @@ static int init_binary(struct output *o)
 static int data_binary(struct output *o, char *data_in, uint64_t length_in, char **data_out, uint64_t *length_out)
 {
 	struct context *ctx;
-	int outsize, offset, p;
+	unsigned int outsize, offset, p;
 	uint64_t sample;
 	char *outbuf;
 
 	ctx = o->internal;
-	outsize = length_in / ctx->unitsize * ctx->num_enabled_probes * 3 + 512;
+	outsize = length_in / ctx->unitsize * ctx->num_enabled_probes * ctx->samples_per_line + 512;
 	outbuf = calloc(1, outsize+1);
 	if(ctx->header) {
 		/* the header is still in here, we must be on the first data packet */
@@ -162,7 +162,7 @@ static int data_binary(struct output *o, char *data_in, uint64_t length_in, char
 	else
 		outbuf[0] = 0;
 
-	if(length_in > ctx->unitsize) {
+	if(length_in >= ctx->unitsize) {
 		for(offset = 0; offset <= length_in - ctx->unitsize; offset += ctx->unitsize) {
 			memcpy(&sample, data_in + offset, ctx->unitsize);
 			for(p = 0; p < ctx->num_enabled_probes; p++) {
@@ -183,7 +183,7 @@ static int data_binary(struct output *o, char *data_in, uint64_t length_in, char
 
 			/* end of line */
 			if(ctx->spl_cnt >= ctx->samples_per_line) {
-				flush_linebufs(ctx, o->device->probes, outbuf);
+				flush_linebufs(ctx, outbuf);
 				ctx->line_offset = ctx->spl_cnt = 0;
 			}
 		}
@@ -208,12 +208,12 @@ static int init_hex(struct output *o)
 static int data_hex(struct output *o, char *data_in, uint64_t length_in, char **data_out, uint64_t *length_out)
 {
 	struct context *ctx;
-	int outsize, offset, p;
+	unsigned int outsize, offset, p;
 	uint64_t sample;
 	char *outbuf;
 
 	ctx = o->internal;
-	outsize = length_in / ctx->unitsize * ctx->num_enabled_probes * 3 + 512;
+	outsize = length_in / ctx->unitsize * ctx->num_enabled_probes * ctx->samples_per_line + 512;
 	outbuf = calloc(1, outsize+1);
 	if(ctx->header) {
 		/* the header is still in here, we must be on the first data packet */
@@ -244,7 +244,7 @@ static int data_hex(struct output *o, char *data_in, uint64_t length_in, char **
 
 		/* end of line */
 		if(ctx->spl_cnt >= ctx->samples_per_line) {
-			flush_linebufs(ctx, o->device->probes, outbuf);
+			flush_linebufs(ctx, outbuf);
 			ctx->line_offset = ctx->spl_cnt = 0;
 		}
 	}
@@ -258,8 +258,8 @@ static int data_hex(struct output *o, char *data_in, uint64_t length_in, char **
 
 
 struct output_format output_text_binary = {
-	"bin",
-	"Text (binary)",
+	"bits",
+	"Text (bits)",
 	init_binary,
 	data_binary,
 	event