sigrok-proto.h: Drop obsolete prototype, move other one.

[libsigrok.git] / output / output_analog.c

diff --git a/output/output_analog.c b/output/output_analog.c
index 94bd8d8d23f034dc236d0274f8f381c8c904a285..663b8df3ae9c77581c40a1522868c36fe57b602b 100644 (file)
--- a/output/output_analog.c
+++ b/output/output_analog.c
@@ -202,8 +202,8 @@ static int init_bits(struct sr_output *o)
        return init(o, DEFAULT_BPL_BITS, MODE_BITS);
 }
 
-static int data_bits(struct sr_output *o, char *data_in, uint64_t length_in,
-                    char **data_out, uint64_t *length_out)
+static 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;
@@ -212,7 +212,7 @@ static int data_bits(struct sr_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
@@ -274,7 +274,7 @@ static int data_bits(struct sr_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;
@@ -288,8 +288,8 @@ static int init_hex(struct sr_output *o)
        return init(o, DEFAULT_BPL_HEX, MODE_HEX);
 }
 
-static int data_hex(struct sr_output *o, char *data_in, uint64_t length_in,
-                   char **data_out, uint64_t *length_out)
+static 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;
@@ -298,7 +298,7 @@ static int data_hex(struct sr_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;
@@ -353,8 +353,8 @@ static int init_ascii(struct sr_output *o)
        return init(o, DEFAULT_BPL_ASCII, MODE_ASCII);
 }
 
-static int data_ascii(struct sr_output *o, char *data_in, uint64_t length_in,
-                    char **data_out, uint64_t *length_out)
+static 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;
@@ -363,7 +363,7 @@ static int data_ascii(struct sr_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
@@ -428,7 +428,7 @@ static int data_ascii(struct sr_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;
@@ -439,29 +439,29 @@ static int data_ascii(struct sr_output *o, char *data_in, uint64_t length_in,
 #endif
 
 struct sr_output_format output_analog_bits = {
-       "analog_bits",
-       "Bits (takes argument, default 64)",
-       SR_DF_ANALOG,
-       init_bits,
-       data_bits,
-       event,
+       .id = "analog_bits",
+       .description = "Bits (takes argument, default 64)",
+       .df_type = SR_DF_ANALOG,
+       .init = init_bits,
+       .data = data_bits,
+       .event = event,
 };
 #if 0
 struct sr_output_format output_analog_hex = {
-       "analog_hex",
-       "Hexadecimal (takes argument, default 192)",
-       SR_DF_ANALOG,
-       init_hex,
-       data_hex,
-       event,
+       .id = "analog_hex",
+       .description = "Hexadecimal (takes argument, default 192)",
+       .df_type = SR_DF_ANALOG,
+       .init = init_hex,
+       .data = data_hex,
+       .event = event,
 };
 
 struct sr_output_format output_analog_ascii = {
-       "analog_ascii",
-       "ASCII (takes argument, default 74)",
-       SR_DF_ANALOG,
-       init_ascii,
-       data_ascii,
-       event,
+       .id = "analog_ascii",
+       .description = "ASCII (takes argument, default 74)",
+       .df_type = SR_DF_ANALOG,
+       .init = init_ascii,
+       .data = data_ascii,
+       .event = event,
 };
 #endif