BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

output_vcd: Remember samples between packets. 

Fixes two bugs in vcd output:
1) Waveform did not match original input when viewed in gtkwave.
2) No vcd output when using 1 MHz sampling on Sigma.
This commit is contained in:
Håvard Espeland 2011-01-16 17:34:49 +01:00
parent 88c51afe87
commit 08b488b848
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
output/output_vcd.c
View File

@ -31,6 +31,7 @@ struct context {
char *probelist[65]; char *probelist[65];
int *prevbits; int *prevbits;
GString *header; GString *header;
uint64_t prevsample;
}; };
const char *vcd_header = "\ const char *vcd_header = "\
@ -169,9 +170,10 @@ static int data(struct output *o, char *data_in, uint64_t length_in,
struct context *ctx; struct context *ctx;
unsigned int i; unsigned int i;
int p, curbit, prevbit; int p, curbit, prevbit;
uint64_t sample, prevsample; uint64_t sample;
static uint64_t samplecount = 0; static uint64_t samplecount = 0;
GString *out; GString *out;
int first_sample = 0;
ctx = o->internal; ctx = o->internal;
out = g_string_sized_new(512); out = g_string_sized_new(512);
@ -181,19 +183,24 @@ static int data(struct output *o, char *data_in, uint64_t length_in,
g_string_append(out, ctx->header->str); g_string_append(out, ctx->header->str);
g_string_free(ctx->header, TRUE); g_string_free(ctx->header, TRUE);
ctx->header = NULL; ctx->header = NULL;
first_sample = 1;
} }
for (i = 0; i <= length_in - ctx->unitsize; i += ctx->unitsize) { for (i = 0; i <= length_in - ctx->unitsize; i += ctx->unitsize) {
samplecount++; samplecount++;
memcpy(&sample, data_in + i, ctx->unitsize); memcpy(&sample, data_in + i, ctx->unitsize);
if (i == 0)
prevsample = sample; if (first_sample) {
else /* First packet. We neg to make sure sample is stored. */
memcpy(&prevsample, data_in + i - 1, ctx->unitsize); ctx->prevsample = ~sample;
first_sample = 0;
}
for (p = 0; p < ctx->num_enabled_probes; p++) { for (p = 0; p < ctx->num_enabled_probes; p++) {
curbit = (sample & ((uint64_t) (1 << p))) >> p; curbit = (sample & ((uint64_t) (1 << p))) >> p;
prevbit = (prevsample & ((uint64_t) (1 << p))) >> p; prevbit = (ctx->prevsample & ((uint64_t) (1 << p))) >> p;
/* VCD only contains deltas/changes of signals. */ /* VCD only contains deltas/changes of signals. */
if (prevbit == curbit) if (prevbit == curbit)
@ -203,6 +210,8 @@ static int data(struct output *o, char *data_in, uint64_t length_in,
g_string_append_printf(out, "#%" PRIu64 "\n%i%c\n", samplecount, g_string_append_printf(out, "#%" PRIu64 "\n%i%c\n", samplecount,
curbit, (char)('!' + p)); curbit, (char)('!' + p));
} }
ctx->prevsample = sample;
} }
*data_out = out->str; *data_out = out->str;