fx2lafw: Fixed a compiler error, and made cv_data consistent with saleae-logic.c

[libsigrok.git] / output / vcd.c

diff --git a/output/vcd.c b/output/vcd.c
index 64e2438e6813dbe7b10f5d83545921725bd1b7fd..91f72c1377a63af1c24b010aa4efef1f401a1425 100644 (file)
--- a/output/vcd.c
+++ b/output/vcd.c
@@ -84,9 +84,9 @@ static int init(struct sr_output *o)
        g_string_append_printf(ctx->header, "$version %s %s $end\n",
                        PACKAGE, PACKAGE_VERSION);
 
-       if (o->dev->plugin && sr_dev_has_hwcap(o->dev, SR_HWCAP_SAMPLERATE)) {
-               ctx->samplerate = *((uint64_t *) o->dev->plugin->get_dev_info(
-                               o->dev->plugin_index, SR_DI_CUR_SAMPLERATE));
+       if (o->dev->driver && sr_dev_has_hwcap(o->dev, SR_HWCAP_SAMPLERATE)) {
+               ctx->samplerate = *((uint64_t *) o->dev->driver->dev_info_get(
+                               o->dev->driver_index, SR_DI_CUR_SAMPLERATE));
                if (!((samplerate_s = sr_samplerate_string(ctx->samplerate)))) {
                        g_string_free(ctx->header, TRUE);
                        g_free(ctx);
@@ -138,10 +138,8 @@ static int init(struct sr_output *o)
 static int event(struct sr_output *o, int event_type, char **data_out,
                 uint64_t *length_out)
 {
-       struct context *ctx;
        char *outbuf;
 
-       ctx = o->internal;
        switch (event_type) {
        case SR_DF_END:
                outbuf = g_strdup("$dumpoff\n$end\n");