X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Ftext%2Fhex.c;h=e604d9735f76a04ae2ec1b5270b5128c50b66f8f;hb=4bc5fd4568350e3d4025ea72158a8a611650a912;hp=37785af360a19e4f5abac3d64a4efdd708c06064;hpb=54ac5277c5e462f1778300b9bc3fdd4709ecb2dc;p=libsigrok.git

diff --git a/output/text/hex.c b/output/text/hex.c
index 37785af3..e604d973 100644
--- a/output/text/hex.c
+++ b/output/text/hex.c
@@ -24,7 +24,6 @@
 #include <sigrok.h>
 #include "text.h"
 
-
 int init_hex(struct sr_output *o)
 {
 	return init(o, DEFAULT_BPL_HEX, MODE_HEX);
@@ -40,7 +39,7 @@ int data_hex(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 / 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 sr_output *o, const char *data_in, uint64_t length_in,
 	return SR_OK;
 }
 
-
 struct sr_output_format output_text_hex = {
-	"hex",
-	"Hexadecimal (takes argument, default 192)",
-	SR_DF_LOGIC,
-	init_hex,
-	data_hex,
-	event,
+	.id = "hex",
+	.description = "Hexadecimal (takes argument, default 192)",
+	.df_type = SR_DF_LOGIC,
+	.init = init_hex,
+	.data = data_hex,
+	.event = event,
 };
-