X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Ftext%2Fhex.c;h=964cb9ccb69e69e0c7ca676b4d417a8f3de53ae8;hb=7c1d391c8b33bf76f7c6617fe9d5174e16a04f95;hp=943ce01cee6420da10627f55699e69ff6b3e4e24;hpb=e46b8fb154ba90ffec9c1f805399dfa819e736f9;p=libsigrok.git

diff --git a/output/text/hex.c b/output/text/hex.c
index 943ce01c..964cb9cc 100644
--- a/output/text/hex.c
+++ b/output/text/hex.c
@@ -21,17 +21,16 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include <sigrok.h>
+#include "sigrok.h"
 #include "text.h"
 
-
-int init_hex(struct output *o)
+SR_PRIV 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)
+SR_PRIV 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,7 +39,7 @@ 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;
@@ -90,13 +89,11 @@ int data_hex(struct output *o, char *data_in, uint64_t length_in,
 	return SR_OK;
 }
 
-
-struct output_format output_text_hex = {
-	"hex",
-	"Hexadecimal (takes argument, default 192)",
-	DF_LOGIC,
-	init_hex,
-	data_hex,
-	event,
+SR_PRIV struct sr_output_format output_text_hex = {
+	.id = "hex",
+	.description = "Hexadecimal (takes argument, default 192)",
+	.df_type = SR_DF_LOGIC,
+	.init = init_hex,
+	.data = data_hex,
+	.event = event,
 };
-