/*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
*
* Copyright (C) 2010 Uwe Hermann <uwe@hermann-uwe.de>
- * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2013 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
struct context {
int num_enabled_probes;
char *probelist[SR_MAX_NUM_PROBES + 1];
- int *prevbits;
+ int probeindices[SR_MAX_NUM_PROBES + 1];
GString *header;
- uint64_t prevsample;
+ uint8_t *prevsample;
int period;
uint64_t samplerate;
+ unsigned int unitsize;
};
static const char *vcd_header_comment = "\
struct context *ctx;
struct sr_probe *probe;
GSList *l;
- uint64_t *samplerate;
+ GVariant *gvar;
int num_probes, i;
char *samplerate_s, *frequency_s, *timestamp;
time_t t;
probe = l->data;
if (!probe->enabled)
continue;
- ctx->probelist[ctx->num_enabled_probes++] = probe->name;
+ ctx->probelist[ctx->num_enabled_probes] = probe->name;
+ ctx->probeindices[ctx->num_enabled_probes] = probe->index;
+ ctx->num_enabled_probes++;
}
if (ctx->num_enabled_probes > 94) {
sr_err("VCD only supports 94 probes.");
return SR_ERR;
}
+ ctx->unitsize = (ctx->num_enabled_probes + 7) / 8;
ctx->probelist[ctx->num_enabled_probes] = 0;
ctx->header = g_string_sized_new(512);
num_probes = g_slist_length(o->sdi->probes);
PACKAGE, PACKAGE_VERSION);
if (o->sdi->driver && sr_dev_has_option(o->sdi, SR_CONF_SAMPLERATE)) {
- o->sdi->driver->config_get(SR_CONF_SAMPLERATE,
- (const void **)&samplerate, o->sdi);
- ctx->samplerate = *samplerate;
+ o->sdi->driver->config_get(SR_CONF_SAMPLERATE, &gvar, o->sdi);
+ ctx->samplerate = g_variant_get_uint64(gvar);
if (!((samplerate_s = sr_samplerate_string(ctx->samplerate)))) {
g_string_free(ctx->header, TRUE);
g_free(ctx);
+ g_variant_unref(gvar);
return SR_ERR;
}
g_string_append_printf(ctx->header, vcd_header_comment,
ctx->num_enabled_probes, num_probes, samplerate_s);
g_free(samplerate_s);
+ g_variant_unref(gvar);
}
/* timescale */
g_string_append(ctx->header, "$upscope $end\n"
"$enddefinitions $end\n$dumpvars\n");
- if (!(ctx->prevbits = g_try_malloc0(sizeof(int) * num_probes))) {
+ if (!(ctx->prevsample = g_try_malloc0(ctx->unitsize))) {
g_string_free(ctx->header, TRUE);
g_free(ctx);
- sr_err("%s: ctx->prevbits malloc failed", __func__);
+ sr_err("%s: ctx->prevsample malloc failed", __func__);
return SR_ERR_MALLOC;
}
struct context *ctx;
GString *text;
unsigned int i;
- int p, curbit, prevbit;
- uint64_t sample;
+ int p, curbit, prevbit, index;
+ uint8_t *sample;
static uint64_t samplecount = 0;
- gboolean first_sample;
(void)sdi;
/* The header is still here, this must be the first packet. */
text = ctx->header;
ctx->header = NULL;
- first_sample = TRUE;
} else {
text = g_string_sized_new(512);
- first_sample = FALSE;
}
logic = packet->payload;
for (i = 0; i <= logic->length - logic->unitsize; i += logic->unitsize) {
samplecount++;
- memcpy(&sample, logic->data + i, logic->unitsize);
-
- if (first_sample) {
- /* First packet. We neg to make sure sample is stored. */
- ctx->prevsample = ~sample;
- first_sample = FALSE;
- }
+ sample = logic->data + i;
for (p = 0; p < ctx->num_enabled_probes; p++) {
- curbit = (sample & ((uint64_t) (1 << p))) >> p;
- prevbit = (ctx->prevsample & ((uint64_t) (1 << p))) >> p;
+ index = ctx->probeindices[p % 8];
+ curbit = (sample[p / 8] & (((uint8_t) 1) << index)) >> index;
+ prevbit = (ctx->prevsample[p / 8] & (((uint64_t) 1) << index)) >> index;
/* VCD only contains deltas/changes of signals. */
if (prevbit == curbit)
* ctx->period), curbit, (char)('!' + p));
}
- ctx->prevsample = sample;
+ memcpy(ctx->prevsample, sample, ctx->unitsize);
}
return text;