sr: moved sigrok.h so libsigrok/libsigrok.h

[libsigrok.git] / output / vcd.c

diff --git a/output/vcd.c b/output/vcd.c
index c5a6bb2022ef541ec3fc98a8ef770f4b12f2f1dd..7f7342795e139c670b89a5e57b16342a6913bcb8 100644 (file)
--- a/output/vcd.c
+++ b/output/vcd.c
@@ -2,7 +2,7 @@
  * This file is part of the sigrok project.
  *
  * Copyright (C) 2010 Uwe Hermann <uwe@hermann-uwe.de>
- * Copyright (C) 2011 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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;
@@ -57,21 +57,21 @@ static int init(struct sr_output *o)
        o->internal = ctx;
        ctx->num_enabled_probes = 0;
 
-       for (l = o->device->probes; l; l = l->next) {
+       for (l = o->dev->probes; l; l = l->next) {
                probe = l->data;
                if (!probe->enabled)
                        continue;
                ctx->probelist[ctx->num_enabled_probes++] = probe->name;
        }
        if (ctx->num_enabled_probes > 94) {
-               sr_err("VCD only supports 94 probes.");
+               sr_err("vcd out: VCD only supports 94 probes.");
                return SR_ERR;
        }
 
        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->device->probes);
+       num_probes = g_slist_length(o->dev->probes);
 
        /* timestamp */
        t = time(NULL);
@@ -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->device->plugin && sr_device_has_hwcap(o->device, SR_HWCAP_SAMPLERATE)) {
-               ctx->samplerate = *((uint64_t *) o->device->plugin->get_device_info(
-                               o->device->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);
@@ -135,18 +135,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 +157,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 +207,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);