Rename 'struct sr_probe' to 'struct sr_channel' everywhere.

[libsigrok.git] / output / vcd.c

diff --git a/output/vcd.c b/output/vcd.c
index ffc753281a53f0f0b45c1bea8f2a53ae95da4546..7df345213250f2bc407d3821ba28c45aa0a6ea3d 100644 (file)
--- a/output/vcd.c
+++ b/output/vcd.c
@@ -39,13 +39,13 @@ 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)
 {
        struct context *ctx;
-       struct sr_probe *probe;
+       struct sr_channel *probe;
        GSList *l;
        GVariant *gvar;
        int num_probes, i;
@@ -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);
@@ -156,20 +156,15 @@ static int receive(struct sr_output *o, const struct sr_dev_inst *sdi,
        unsigned int i;
        int p, curbit, prevbit, index;
        uint8_t *sample;
+       gboolean timestamp_written;
 
        (void)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;
@@ -179,25 +174,49 @@ 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;
+               timestamp_written = FALSE;
 
                for (p = 0; p < ctx->num_enabled_probes; p++) {
                        index = g_array_index(ctx->probeindices, int, p);
-                       curbit = ((unsigned)sample[index / 8] >> (index % 8)) & 1;
-                       prevbit = ((unsigned)ctx->prevsample[index / 8] >> (index % 8)) & 1;
+
+                       curbit = ((unsigned)sample[index / 8]
+                                       >> (index % 8)) & 1;
+                       prevbit = ((unsigned)ctx->prevsample[index / 8]
+                                       >> (index % 8)) & 1;
 
                        /* VCD only contains deltas/changes of signals. */
                        if (prevbit == curbit && ctx->samplecount > 0)
                                continue;
 
+                       /* Output timestamp of subsequent signal changes. */
+                       if (!timestamp_written)
+                               g_string_append_printf(*out, "#%.0f",
+                                       (double)ctx->samplecount /
+                                               ctx->samplerate * ctx->period);
+
                        /* Output which signal changed to which value. */
-                       g_string_append_printf(*out, "#%.0f\n%i%c\n",
-                               (double)ctx->samplecount / ctx->samplerate * ctx->period,
-                               curbit, (char)('!' + p));
+                       g_string_append_c(*out, ' ');
+                       g_string_append_c(*out, '0' + curbit);
+                       g_string_append_c(*out, '!' + p);
+
+                       timestamp_written = TRUE;
                }
 
+               if (timestamp_written)
+                       g_string_append_c(*out, '\n');
+
                ctx->samplecount++;
                memcpy(ctx->prevsample, sample, ctx->unitsize);
        }