Make some more items 'static'.

[libsigrok.git] / output / text / hex.c

diff --git a/output/text/hex.c b/output/text/hex.c
index 943ce01cee6420da10627f55699e69ff6b3e4e24..285102ee461f7005289e7ee0bc3b7d39fc69227e 100644 (file)
--- 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,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 = {
+struct sr_output_format output_text_hex = {
        "hex",
        "Hexadecimal (takes argument, default 192)",
-       DF_LOGIC,
+       SR_DF_LOGIC,
        init_hex,
        data_hex,
        event,
 };
-