output/vcd: Extend output stream to last sample.

[libsigrok.git] / output / vcd.c

diff --git a/output/vcd.c b/output/vcd.c
index 49d2d195a409e5da702de6d2b00729ff9a1c4348..79145c1ae0b4f8d9e41dc3d58dea47b04b5f0168 100644 (file)
--- a/output/vcd.c
+++ b/output/vcd.c
@@ -39,8 +39,8 @@ struct context {
        unsigned int unitsize;
 };
 
-static const char *vcd_header_comment = "\
-$comment\n  Acquisition with %d/%d probes at %s\n$end\n";
+static const char *const vcd_header_comment =
+       "$comment\n  Acquisition with %d/%d probes at %s\n$end\n";
 
 static int init(struct sr_output *o)
 {
@@ -136,7 +136,7 @@ static int init(struct sr_output *o)
        }
 
        g_string_append(ctx->header, "$upscope $end\n"
-                       "$enddefinitions $end\n$dumpvars\n");
+                       "$enddefinitions $end\n");
 
        if (!(ctx->prevsample = g_try_malloc0(ctx->unitsize))) {
                g_string_free(ctx->header, TRUE);
@@ -162,15 +162,9 @@ static int receive(struct sr_output *o, const struct sr_dev_inst *sdi,
 
        *out = NULL;
        if (!o || !o->internal)
-               return SR_ERR_ARG;
+               return SR_ERR_BUG;
        ctx = o->internal;
 
-       if (packet->type == SR_DF_END) {
-               *out = g_string_new("$dumpoff\n$end\n");
-               return SR_OK;
-       } else if (packet->type != SR_DF_LOGIC)
-               return SR_OK;
-
        if (ctx->header) {
                /* The header is still here, this must be the first packet. */
                *out = ctx->header;
@@ -180,6 +174,15 @@ static int receive(struct sr_output *o, const struct sr_dev_inst *sdi,
                *out = g_string_sized_new(512);
        }
 
+       if (packet->type != SR_DF_LOGIC) {
+               if (packet->type == SR_DF_END)
+                       /* Write final timestamp as length indicator. */
+                       g_string_append_printf(*out, "#%.0f\n",
+                               (double)ctx->samplecount /
+                                       ctx->samplerate * ctx->period);
+               return SR_OK;
+       }
+
        logic = packet->payload;
        for (i = 0; i <= logic->length - logic->unitsize; i += logic->unitsize) {
                sample = logic->data + i;