input/output formats: Explicit struct member names.

[libsigrok.git] / output / output_vcd.c

diff --git a/output/output_vcd.c b/output/output_vcd.c
index 61d27a10ec157a538d338b6bca834536355d6aa7..bd16bc2e1d26e7829893a90f76aeecea1761d60d 100644 (file)
--- a/output/output_vcd.c
+++ b/output/output_vcd.c
@@ -36,17 +36,7 @@ struct context {
        uint64_t samplerate;
 };
 
-const char *vcd_header = "\
-$date %s $end\n\
-$version %s $end\n%s\
-$timescale %s $end\n\
-$scope module %s $end\n\
-%s\
-$upscope $end\n\
-$enddefinitions $end\n\
-$dumpvars\n";
-
-const char *vcd_header_comment = "\
+static const char *vcd_header_comment = "\
 $comment\n  Acquisition with %d/%d probes at %s\n$end\n";
 
 static int init(struct sr_output *o)
@@ -106,12 +96,12 @@ static int init(struct sr_output *o)
 
        /* timescale */
        /* VCD can only handle 1/10/100 (s - fs), so scale up first */
-       if (ctx->samplerate > MHZ(1))
-               ctx->period = GHZ(1);
-       else if (ctx->samplerate > KHZ(1))
-               ctx->period = MHZ(1);
+       if (ctx->samplerate > SR_MHZ(1))
+               ctx->period = SR_GHZ(1);
+       else if (ctx->samplerate > SR_KHZ(1))
+               ctx->period = SR_MHZ(1);
        else
-               ctx->period = KHZ(1);
+               ctx->period = SR_KHZ(1);
        if (!(frequency_s = sr_period_string(ctx->period))) {
                g_string_free(ctx->header, TRUE);
                free(ctx);
@@ -165,7 +155,7 @@ static int event(struct sr_output *o, int event_type, char **data_out,
        return SR_OK;
 }
 
-static int data(struct sr_output *o, char *data_in, uint64_t length_in,
+static int data(struct sr_output *o, const char *data_in, uint64_t length_in,
                char **data_out, uint64_t *length_out)
 {
        struct context *ctx;
@@ -223,10 +213,10 @@ static int data(struct sr_output *o, char *data_in, uint64_t length_in,
 }
 
 struct sr_output_format output_vcd = {
-       "vcd",
-       "Value Change Dump (VCD)",
-       SR_DF_LOGIC,
-       init,
-       data,
-       event,
+       .extension = "vcd",
+       .description = "Value Change Dump (VCD)",
+       .df_type = SR_DF_LOGIC,
+       .init = init,
+       .data = data,
+       .event = event,
 };