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

vcd output: Replace fixed length array of indices with GArray.

This commit is contained in:
Martin Ling 2013-04-26 23:16:30 +01:00 committed by Bert Vermeulen
parent d601c0e9b3
commit a1be7b6c3f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
output/vcd.c
View File

@ -37,7 +37,7 @@
struct context { struct context {
int num_enabled_probes; int num_enabled_probes;
int probeindices[SR_MAX_NUM_PROBES + 1]; GArray *probeindices;
GString *header; GString *header;
uint8_t *prevsample; uint8_t *prevsample;
int period; int period;
@ -65,12 +65,14 @@ static int init(struct sr_output *o)
o->internal = ctx; o->internal = ctx;
ctx->num_enabled_probes = 0; ctx->num_enabled_probes = 0;
ctx->probeindices = g_array_new(FALSE, FALSE, sizeof(int));
for (l = o->sdi->probes; l; l = l->next) { for (l = o->sdi->probes; l; l = l->next) {
probe = l->data; probe = l->data;
if (!probe->enabled) if (!probe->enabled)
continue; continue;
ctx->probeindices[ctx->num_enabled_probes] = probe->index; ctx->probeindices = g_array_append_val(
ctx->probeindices, probe->index);
ctx->num_enabled_probes++; ctx->num_enabled_probes++;
} }
if (ctx->num_enabled_probes > 94) { if (ctx->num_enabled_probes > 94) {
@ -188,7 +190,7 @@ static GString *receive(struct sr_output *o, const struct sr_dev_inst *sdi,
sample = logic->data + i; sample = logic->data + i;
for (p = 0; p < ctx->num_enabled_probes; p++) { for (p = 0; p < ctx->num_enabled_probes; p++) {
index = ctx->probeindices[p % 8]; index = g_array_index(ctx->probeindices, int, p);
curbit = (sample[p / 8] & (((uint8_t) 1) << index)) >> index; curbit = (sample[p / 8] & (((uint8_t) 1) << index)) >> index;
prevbit = (ctx->prevsample[p / 8] & (((uint64_t) 1) << index)) >> index; prevbit = (ctx->prevsample[p / 8] & (((uint64_t) 1) << index)) >> index;