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

output/vcd: Use selected probes, not lowest-numbered ones 

Thanks to Andrew Bardsley for the patch.
This commit is contained in:
Bert Vermeulen 2013-04-11 18:49:24 +02:00
parent 254dd102e8
commit ba6568c5ad
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
output/vcd.c
View File

@ -38,6 +38,7 @@
struct context { struct context {
int num_enabled_probes; int num_enabled_probes;
char *probelist[SR_MAX_NUM_PROBES + 1]; char *probelist[SR_MAX_NUM_PROBES + 1];
int probeindices[SR_MAX_NUM_PROBES + 1];
int *prevbits; int *prevbits;
GString *header; GString *header;
uint64_t prevsample; uint64_t prevsample;
@ -70,7 +71,9 @@ static int init(struct sr_output *o)
probe = l->data; probe = l->data;
if (!probe->enabled) if (!probe->enabled)
continue; 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) { if (ctx->num_enabled_probes > 94) {
sr_err("VCD only supports 94 probes."); sr_err("VCD only supports 94 probes.");
@ -152,7 +155,7 @@ static GString *receive(struct sr_output *o, const struct sr_dev_inst *sdi,
struct context *ctx; struct context *ctx;
GString *text; GString *text;
unsigned int i; unsigned int i;
int p, curbit, prevbit; int p, curbit, prevbit, index;
uint64_t sample; uint64_t sample;
static uint64_t samplecount = 0; static uint64_t samplecount = 0;
gboolean first_sample; gboolean first_sample;
@ -193,8 +196,9 @@ static GString *receive(struct sr_output *o, const struct sr_dev_inst *sdi,
} }
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; index = ctx->probeindices[p];
prevbit = (ctx->prevsample & ((uint64_t) (1 << p))) >> p; curbit = (sample & (((uint64_t) 1) << index)) >> index;
prevbit = (ctx->prevsample & (((uint64_t) 1) << index)) >> index;
/* VCD only contains deltas/changes of signals. */ /* VCD only contains deltas/changes of signals. */
if (prevbit == curbit) if (prevbit == curbit)