X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Ftext%2Fascii.c;h=2d6aad720666618d347c70d43227a93c938fea88;hb=1a081ca67d63a0bd933a3d715792d85afd437296;hp=e4eacaf3d3d90c71a38efa66e65ada95c660e09b;hpb=54ac5277c5e462f1778300b9bc3fdd4709ecb2dc;p=libsigrok.git

diff --git a/output/text/ascii.c b/output/text/ascii.c
index e4eacaf3..2d6aad72 100644
--- a/output/text/ascii.c
+++ b/output/text/ascii.c
@@ -21,10 +21,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include <sigrok.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
 #include "text.h"
 
-
 int init_ascii(struct sr_output *o)
 {
 	return init(o, DEFAULT_BPL_ASCII, MODE_ASCII);
@@ -40,7 +40,7 @@ int data_ascii(struct sr_output *o, const char *data_in, uint64_t length_in,
 	char *outbuf;
 
 	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
@@ -105,7 +105,7 @@ int data_ascii(struct sr_output *o, const char *data_in, uint64_t length_in,
 			ctx->prevsample = sample;
 		}
 	} else {
-		g_message("short buffer (length_in=%" PRIu64 ")", length_in);
+		sr_info("short buffer (length_in=%" PRIu64 ")", length_in);
 	}
 
 	*data_out = outbuf;
@@ -114,13 +114,11 @@ int data_ascii(struct sr_output *o, const char *data_in, uint64_t length_in,
 	return SR_OK;
 }
 
-
 struct sr_output_format output_text_ascii = {
-	"ascii",
-	"ASCII (takes argument, default 74)",
-	SR_DF_LOGIC,
-	init_ascii,
-	data_ascii,
-	event,
+	.id = "ascii",
+	.description = "ASCII (takes argument, default 74)",
+	.df_type = SR_DF_LOGIC,
+	.init = init_ascii,
+	.data = data_ascii,
+	.event = event,
 };
-