X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Ftext%2Fhex.c;h=285102ee461f7005289e7ee0bc3b7d39fc69227e;hb=8a7b47cdfae4a4a95e92958beab41a4985e8f8e3;hp=39f12134988017ed37953de44b5433f093362612;hpb=97554432e8d8bcf7f5af2dd770bcf752c9cd7d75;p=libsigrok.git

diff --git a/output/text/hex.c b/output/text/hex.c
index 39f12134..285102ee 100644
--- a/output/text/hex.c
+++ b/output/text/hex.c
@@ -24,14 +24,13 @@
 #include <sigrok.h>
 #include "text.h"
 
-
-int init_hex(struct output *o)
+int init_hex(struct sr_output *o)
 {
 	return init(o, DEFAULT_BPL_HEX, MODE_HEX);
 }
 
-int data_hex(struct output *o, char *data_in, uint64_t length_in,
-		    char **data_out, uint64_t *length_out)
+int data_hex(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,13 +39,13 @@ 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
+	max_linelen = SR_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;
+		return SR_ERR_MALLOC;
 
 	outbuf[0] = '\0';
 	if (ctx->header) {
@@ -87,16 +86,14 @@ int data_hex(struct output *o, char *data_in, uint64_t length_in,
 	*data_out = outbuf;
 	*length_out = strlen(outbuf);
 
-	return SIGROK_OK;
+	return SR_OK;
 }
 
-
-struct output_format output_text_hex = {
+struct sr_output_format output_text_hex = {
 	"hex",
 	"Hexadecimal (takes argument, default 192)",
-	DF_LOGIC,
+	SR_DF_LOGIC,
 	init_hex,
 	data_hex,
 	event,
 };
-