Change all sigrok_ prefixes to sr_.

[libsigrok.git] / output / output_vcd.c

diff --git a/output/output_vcd.c b/output/output_vcd.c
index 2ea64538ddbd53c26de7893551f557ccc3256e89..958fbd7c288ba07a3a1375432cfa42de45042b58 100644 (file)
--- a/output/output_vcd.c
+++ b/output/output_vcd.c
@@ -32,6 +32,8 @@ struct context {
        int *prevbits;
        GString *header;
        uint64_t prevsample;
+       int period;
+       uint64_t samplerate;
 };
 
 const char *vcd_header = "\
@@ -47,18 +49,17 @@ $dumpvars\n";
 const char *vcd_header_comment = "\
 $comment\n  Acquisition with %d/%d probes at %s\n$end\n";
 
-static int init(struct output *o)
+static int init(struct sr_output *o)
 {
        struct context *ctx;
        struct probe *probe;
        GSList *l;
-       uint64_t samplerate;
-       int num_probes, period, i;
+       int num_probes, i;
        char *samplerate_s, *frequency_s, *timestamp;
        time_t t;
 
        if (!(ctx = calloc(1, sizeof(struct context))))
-               return SIGROK_ERR_MALLOC;
+               return SR_ERR_MALLOC;
 
        o->internal = ctx;
        ctx->num_enabled_probes = 0;
@@ -71,7 +72,7 @@ static int init(struct output *o)
        }
        if (ctx->num_enabled_probes > 94) {
                g_warning("VCD only supports 94 probes.");
-               return SIGROK_ERR;
+               return SR_ERR;
        }
 
        ctx->probelist[ctx->num_enabled_probes] = 0;
@@ -91,12 +92,12 @@ static int init(struct output *o)
                        PACKAGE, PACKAGE_VERSION);
 
        if (o->device->plugin) {
-               samplerate = *((uint64_t *) o->device->plugin->get_device_info(
+               ctx->samplerate = *((uint64_t *) o->device->plugin->get_device_info(
                                o->device->plugin_index, DI_CUR_SAMPLERATE));
-               if (!((samplerate_s = sigrok_samplerate_string(samplerate)))) {
+               if (!((samplerate_s = sr_samplerate_string(ctx->samplerate)))) {
                        g_string_free(ctx->header, TRUE);
                        free(ctx);
-                       return SIGROK_ERR;
+                       return SR_ERR;
                }
                g_string_append_printf(ctx->header, vcd_header_comment,
                                 ctx->num_enabled_probes, num_probes, samplerate_s);
@@ -105,16 +106,16 @@ static int init(struct output *o)
 
        /* timescale */
        /* VCD can only handle 1/10/100 (s - fs), so scale up first */
-       if (samplerate > MHZ(1))
-               period = GHZ(1);
-       else if (samplerate > KHZ(1))
-               period = MHZ(1);
+       if (ctx->samplerate > MHZ(1))
+               ctx->period = GHZ(1);
+       else if (ctx->samplerate > KHZ(1))
+               ctx->period = MHZ(1);
        else
-               period = KHZ(1);
-       if (!(frequency_s = sigrok_period_string(period))) {
+               ctx->period = KHZ(1);
+       if (!(frequency_s = sr_period_string(ctx->period))) {
                g_string_free(ctx->header, TRUE);
                free(ctx);
-               return SIGROK_ERR;
+               return SR_ERR;
        }
        g_string_append_printf(ctx->header, "$timescale %s $end\n", frequency_s);
        free(frequency_s);
@@ -134,13 +135,13 @@ static int init(struct output *o)
        if (!(ctx->prevbits = calloc(sizeof(int), num_probes))) {
                g_string_free(ctx->header, TRUE);
                free(ctx);
-               return SIGROK_ERR_MALLOC;
+               return SR_ERR_MALLOC;
        }
 
-       return SIGROK_OK;
+       return SR_OK;
 }
 
-static int event(struct output *o, int event_type, char **data_out,
+static int event(struct sr_output *o, int event_type, char **data_out,
                 uint64_t *length_out)
 {
        struct context *ctx;
@@ -161,10 +162,10 @@ static int event(struct output *o, int event_type, char **data_out,
                break;
        }
 
-       return SIGROK_OK;
+       return SR_OK;
 }
 
-static int data(struct output *o, char *data_in, uint64_t length_in,
+static int data(struct sr_output *o, char *data_in, uint64_t length_in,
                char **data_out, uint64_t *length_out)
 {
        struct context *ctx;
@@ -197,7 +198,6 @@ static int data(struct output *o, char *data_in, uint64_t length_in,
                        first_sample = 0;
                }
 
-
                for (p = 0; p < ctx->num_enabled_probes; p++) {
                        curbit = (sample & ((uint64_t) (1 << p))) >> p;
                        prevbit = (ctx->prevsample & ((uint64_t) (1 << p))) >> p;
@@ -207,8 +207,9 @@ static int data(struct output *o, char *data_in, uint64_t length_in,
                                continue;
 
                        /* Output which signal changed to which value. */
-                       g_string_append_printf(out, "#%" PRIu64 "\n%i%c\n", samplecount,
-                                       curbit, (char)('!' + p));
+                       g_string_append_printf(out, "#%" PRIu64 "\n%i%c\n",
+                                       (uint64_t)(((float)samplecount / ctx->samplerate)
+                                       * ctx->period), curbit, (char)('!' + p));
                }
 
                ctx->prevsample = sample;
@@ -218,10 +219,10 @@ static int data(struct output *o, char *data_in, uint64_t length_in,
        *length_out = out->len;
        g_string_free(out, FALSE);
 
-       return SIGROK_OK;
+       return SR_OK;
 }
 
-struct output_format output_vcd = {
+struct sr_output_format output_vcd = {
        "vcd",
        "Value Change Dump (VCD)",
        DF_LOGIC,