VCD: Optimizations and fixes.

[libsigrok.git] / output / output_gnuplot.c

diff --git a/output/output_gnuplot.c b/output/output_gnuplot.c
index 2c062397db98075c3167a45ba000b86c4433eeea..69a45256c432b4eb3b0bd2891e24a8134e843bd4 100644 (file)
--- a/output/output_gnuplot.c
+++ b/output/output_gnuplot.c
@@ -143,7 +143,8 @@ static int data(struct output *o, char *data_in, uint64_t length_in,
 {
        struct context *ctx;
        unsigned int i, outsize, p, curbit;
-       uint64_t sample, count = 0;
+       uint64_t sample;
+       static uint64_t samplecount = 0;
        char *outbuf, *c;
 
        ctx = o->internal;
@@ -170,11 +171,11 @@ static int data(struct output *o, char *data_in, uint64_t length_in,
 
                /* The first column is a counter (needed for gnuplot). */
                c = outbuf + strlen(outbuf);
-               sprintf(c, "%" PRIu64 "\t\t", count++);
+               sprintf(c, "%" PRIu64 "\t\t", samplecount++);
 
                /* The next columns are the values of all channels. */
                for (p = 0; p < ctx->num_enabled_probes; p++) {
-                       curbit = (sample & ((uint64_t) (1 << p))) != 0;
+                       curbit = (sample & ((uint64_t) (1 << p))) >> p;
                        c = outbuf + strlen(outbuf);
                        sprintf(c, "%d ", curbit);
                }