Project-wide consistent naming for #include guards.

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

diff --git a/output/text/ascii.c b/output/text/ascii.c
index 27f5d74217e0fc19fa61f6566770831d43a5b98d..2d6aad720666618d347c70d43227a93c938fea88 100644 (file)
--- a/output/text/ascii.c
+++ b/output/text/ascii.c
@@ -21,17 +21,17 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include <sigrok.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
@@ -105,7 +105,7 @@ 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;
@@ -114,13 +114,11 @@ int data_ascii(struct output *o, char *data_in, uint64_t length_in,
        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,
 };
-