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

vcd: Output timestamp only once per change. 

Avoid writing a new timestamp for every changed signal if multiple
signals change state simultaneously.  Also, keep signal transitions
on the same line with their timestamp to make the output easier to
inspect in a text editor.  (VCD does not care whether newlines or
spaces are used to separate tokens.)
This commit is contained in:
Daniel Elstner 2014-01-30 21:57:49 +01:00
parent 563080a8d1
commit 2b6363b433
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
output/vcd.c
View File

@ -156,6 +156,7 @@ static int receive(struct sr_output *o, const struct sr_dev_inst *sdi,
unsigned int i; unsigned int i;
int p, curbit, prevbit, index; int p, curbit, prevbit, index;
uint8_t *sample; uint8_t *sample;
gboolean timestamp_written;
(void)sdi; (void)sdi;
@ -182,22 +183,37 @@ static int receive(struct sr_output *o, const struct sr_dev_inst *sdi,
logic = packet->payload; logic = packet->payload;
for (i = 0; i <= logic->length - logic->unitsize; i += logic->unitsize) { for (i = 0; i <= logic->length - logic->unitsize; i += logic->unitsize) {
sample = logic->data + i; sample = logic->data + i;
timestamp_written = FALSE;
for (p = 0; p < ctx->num_enabled_probes; p++) { for (p = 0; p < ctx->num_enabled_probes; p++) {
index = g_array_index(ctx->probeindices, int, p); index = g_array_index(ctx->probeindices, int, p);
curbit = ((unsigned)sample[index / 8] >> (index % 8)) & 1;
prevbit = ((unsigned)ctx->prevsample[index / 8] >> (index % 8)) & 1; curbit = ((unsigned)sample[index / 8]
>> (index % 8)) & 1;
prevbit = ((unsigned)ctx->prevsample[index / 8]
>> (index % 8)) & 1;
/* VCD only contains deltas/changes of signals. */ /* VCD only contains deltas/changes of signals. */
if (prevbit == curbit && ctx->samplecount > 0) if (prevbit == curbit && ctx->samplecount > 0)
continue; continue;
/* Output timestamp of subsequent signal changes. */
if (!timestamp_written)
g_string_append_printf(*out, "#%.0f",
(double)ctx->samplecount /
ctx->samplerate * ctx->period);
/* Output which signal changed to which value. */ /* Output which signal changed to which value. */
g_string_append_printf(*out, "#%.0f\n%i%c\n", g_string_append_c(*out, ' ');
(double)ctx->samplecount / ctx->samplerate * ctx->period, g_string_append_c(*out, '0' + curbit);
curbit, (char)('!' + p)); g_string_append_c(*out, '!' + p);
timestamp_written = TRUE;
} }
if (timestamp_written)
g_string_append_c(*out, '\n');
ctx->samplecount++; ctx->samplecount++;
memcpy(ctx->prevsample, sample, ctx->unitsize); memcpy(ctx->prevsample, sample, ctx->unitsize);
} }