X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Ftext%2Fascii.c;h=2d0c1c36c24f9ab03210486289c2495516e0d6ad;hb=94799bc4dc6ab1ba64cdb7f0fb350d63d4fcee66;hp=b9f08254a54b4fd4dfaba69f5c7146fd233c8404;hpb=97554432e8d8bcf7f5af2dd770bcf752c9cd7d75;p=libsigrok.git

diff --git a/output/text/ascii.c b/output/text/ascii.c
index b9f08254..2d0c1c36 100644
--- a/output/text/ascii.c
+++ b/output/text/ascii.c
@@ -22,16 +22,16 @@
 #include <string.h>
 #include <glib.h>
 #include <sigrok.h>
+#include <sigrok-internal.h>
 #include "text.h"
 
-
-int init_ascii(struct output *o)
+int init_ascii(struct sr_output *o)
 {
 	return init(o, DEFAULT_BPL_ASCII, MODE_ASCII);
 }
 
-int data_ascii(struct output *o, char *data_in, uint64_t length_in,
-		     char **data_out, uint64_t *length_out)
+int data_ascii(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_ascii(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
+	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
@@ -50,7 +50,7 @@ int data_ascii(struct output *o, char *data_in, uint64_t length_in,
             * (ctx->num_enabled_probes * max_linelen);
 
 	if (!(outbuf = calloc(1, outsize + 1)))
-		return SIGROK_ERR_MALLOC;
+		return SR_ERR_MALLOC;
 
 	outbuf[0] = '\0';
 	if (ctx->header) {
@@ -105,22 +105,20 @@ int data_ascii(struct output *o, 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;
 	*length_out = strlen(outbuf);
 
-	return SIGROK_OK;
+	return SR_OK;
 }
 
-
-struct output_format output_text_ascii = {
-	"ascii",
-	"ASCII (takes argument, default 74)",
-	DF_LOGIC,
-	init_ascii,
-	data_ascii,
-	event,
+struct sr_output_format output_text_ascii = {
+	.id = "ascii",
+	.description = "ASCII (takes argument, default 74)",
+	.df_type = SR_DF_LOGIC,
+	.init = init_ascii,
+	.data = data_ascii,
+	.event = event,
 };
-