sr/srd: Fix left-over #includes.

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

diff --git a/output/text/bits.c b/output/text/bits.c
index 75662b80b00711bcc80f63dac16db8930f2be0fc..1d9181849e720d5b65c45ab0afc7f422375162d3 100644 (file)
--- a/output/text/bits.c
+++ b/output/text/bits.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_bits(struct output *o)
+int init_bits(struct sr_output *o)
 {
        return init(o, DEFAULT_BPL_BITS, MODE_BITS);
 }
 
-int data_bits(struct output *o, char *data_in, uint64_t length_in,
-                    char **data_out, uint64_t *length_out)
+int data_bits(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_bits(struct output *o, char *data_in, uint64_t length_in,
        char *outbuf, c;
 
        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
@@ -92,7 +92,7 @@ int data_bits(struct output *o, char *data_in, uint64_t length_in,
                        }
                }
        } else {
-               g_message("short buffer (length_in=%" PRIu64 ")", length_in);
+               sr_info("short buffer (length_in=%" PRIu64 ")", length_in);
        }
 
        *data_out = outbuf;
@@ -101,13 +101,11 @@ int data_bits(struct output *o, char *data_in, uint64_t length_in,
        return SR_OK;
 }
 
-
-struct output_format output_text_bits = {
-       "bits",
-       "Bits (takes argument, default 64)",
-       DF_LOGIC,
-       init_bits,
-       data_bits,
-       event,
+struct sr_output_format output_text_bits = {
+       .id = "bits",
+       .description = "Bits (takes argument, default 64)",
+       .df_type = SR_DF_LOGIC,
+       .init = init_bits,
+       .data = data_bits,
+       .event = event,
 };
-