X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Ftext%2Fbits.c;h=00e4d6b9e5f183c376904d5f57d8b70868805e56;hb=0d31276b05643407ba4a4a9e3f0f95e259c8baa2;hp=b9b1347798c44656c5a1b5be59a2e03dd9557dc0;hpb=f50f3f40d9238b0c50be67e52bc132aadfcf2050;p=libsigrok.git

diff --git a/output/text/bits.c b/output/text/bits.c
index b9b13477..00e4d6b9 100644
--- a/output/text/bits.c
+++ b/output/text/bits.c
@@ -22,16 +22,16 @@
 #include <string.h>
 #include <glib.h>
 #include <sigrok.h>
+#include <sigrok-internal.h>
 #include "text.h"
 
-
 int init_bits(struct sr_output *o)
 {
 	return init(o, DEFAULT_BPL_BITS, MODE_BITS);
 }
 
-int data_bits(struct sr_output *o, char *data_in, uint64_t length_in,
-		     char **data_out, uint64_t *length_out)
+int data_bits(struct sr_output *o, const char *data_in, uint64_t length_in,
+	      char **data_out, uint64_t *length_out)
 {
 	struct context *ctx;
 	unsigned int outsize, offset, p;
@@ -40,7 +40,7 @@ int data_bits(struct sr_output *o, char *data_in, uint64_t length_in,
 	char *outbuf, c;
 
 	ctx = o->internal;
-	max_linelen = MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
+	max_linelen = SR_MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
 			+ ctx->samples_per_line / 8;
         /*
          * Calculate space needed for probes. Set aside 512 bytes for
@@ -92,7 +92,7 @@ int data_bits(struct sr_output *o, char *data_in, uint64_t length_in,
 			}
 		}
 	} else {
-		g_message("short buffer (length_in=%" PRIu64 ")", length_in);
+		sr_info("short buffer (length_in=%" PRIu64 ")", length_in);
 	}
 
 	*data_out = outbuf;
@@ -101,13 +101,11 @@ int data_bits(struct sr_output *o, char *data_in, uint64_t length_in,
 	return SR_OK;
 }
 
-
 struct sr_output_format output_text_bits = {
-	"bits",
-	"Bits (takes argument, default 64)",
-	DF_LOGIC,
-	init_bits,
-	data_bits,
-	event,
+	.id = "bits",
+	.description = "Bits (takes argument, default 64)",
+	.df_type = SR_DF_LOGIC,
+	.init = init_bits,
+	.data = data_bits,
+	.event = event,
 };
-