sr: add new analog output module

[libsigrok.git] / output / vcd.c

diff --git a/output/vcd.c b/output/vcd.c
index 64e2438e6813dbe7b10f5d83545921725bd1b7fd..3a2114c8d3a991aa006240e039c954f961b628f7 100644 (file)
--- a/output/vcd.c
+++ b/output/vcd.c
@@ -23,13 +23,13 @@
 #include <string.h>
 #include <glib.h>
 #include "config.h"
-#include "sigrok.h"
-#include "sigrok-internal.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 
 struct context {
        int num_enabled_probes;
        int unitsize;
-       char *probelist[65];
+       char *probelist[SR_MAX_NUM_PROBES + 1];
        int *prevbits;
        GString *header;
        uint64_t prevsample;
@@ -45,6 +45,7 @@ static int init(struct sr_output *o)
        struct context *ctx;
        struct sr_probe *probe;
        GSList *l;
+       uint64_t *samplerate;
        int num_probes, i;
        char *samplerate_s, *frequency_s, *timestamp;
        time_t t;
@@ -57,7 +58,7 @@ static int init(struct sr_output *o)
        o->internal = ctx;
        ctx->num_enabled_probes = 0;
 
-       for (l = o->dev->probes; l; l = l->next) {
+       for (l = o->sdi->probes; l; l = l->next) {
                probe = l->data;
                if (!probe->enabled)
                        continue;
@@ -71,7 +72,7 @@ static int init(struct sr_output *o)
        ctx->probelist[ctx->num_enabled_probes] = 0;
        ctx->unitsize = (ctx->num_enabled_probes + 7) / 8;
        ctx->header = g_string_sized_new(512);
-       num_probes = g_slist_length(o->dev->probes);
+       num_probes = g_slist_length(o->sdi->probes);
 
        /* timestamp */
        t = time(NULL);
@@ -84,9 +85,10 @@ 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->sdi->driver && sr_dev_has_hwcap(o->sdi, SR_HWCAP_SAMPLERATE)) {
+               o->sdi->driver->info_get(SR_DI_CUR_SAMPLERATE,
+                               (const void **)&samplerate, o->sdi);
+               ctx->samplerate = *samplerate;
                if (!((samplerate_s = sr_samplerate_string(ctx->samplerate)))) {
                        g_string_free(ctx->header, TRUE);
                        g_free(ctx);
@@ -135,18 +137,16 @@ static int init(struct sr_output *o)
        return SR_OK;
 }
 
-static int event(struct sr_output *o, int event_type, char **data_out,
+static int event(struct sr_output *o, int event_type, uint8_t **data_out,
                 uint64_t *length_out)
 {
-       struct context *ctx;
-       char *outbuf;
+       uint8_t *outbuf;
 
-       ctx = o->internal;
        switch (event_type) {
        case SR_DF_END:
-               outbuf = g_strdup("$dumpoff\n$end\n");
+               outbuf = (uint8_t *)g_strdup("$dumpoff\n$end\n");
                *data_out = outbuf;
-               *length_out = strlen(outbuf);
+               *length_out = strlen((const char *)outbuf);
                g_free(o->internal);
                o->internal = NULL;
                break;
@@ -159,8 +159,8 @@ static int event(struct sr_output *o, int event_type, char **data_out,
        return SR_OK;
 }
 
-static int data(struct sr_output *o, const char *data_in, uint64_t length_in,
-               char **data_out, uint64_t *length_out)
+static int data(struct sr_output *o, const uint8_t *data_in,
+               uint64_t length_in, uint8_t **data_out, uint64_t *length_out)
 {
        struct context *ctx;
        unsigned int i;
@@ -209,7 +209,7 @@ static int data(struct sr_output *o, const char *data_in, uint64_t length_in,
                ctx->prevsample = sample;
        }
 
-       *data_out = out->str;
+       *data_out = (uint8_t *)out->str;
        *length_out = out->len;
        g_string_free(out, FALSE);