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

vcd output: Eliminate unnecessary array of probe names.

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

10
output/vcd.c
View File

@ -37,7 +37,6 @@
struct context { struct context {
int num_enabled_probes; int num_enabled_probes;
char *probelist[SR_MAX_NUM_PROBES + 1];
int probeindices[SR_MAX_NUM_PROBES + 1]; int probeindices[SR_MAX_NUM_PROBES + 1];
GString *header; GString *header;
uint8_t *prevsample; uint8_t *prevsample;
@ -71,7 +70,6 @@ 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->probeindices[ctx->num_enabled_probes] = probe->index; ctx->probeindices[ctx->num_enabled_probes] = probe->index;
ctx->num_enabled_probes++; ctx->num_enabled_probes++;
} }
@ -81,7 +79,6 @@ static int init(struct sr_output *o)
} }
ctx->unitsize = (ctx->num_enabled_probes + 7) / 8; ctx->unitsize = (ctx->num_enabled_probes + 7) / 8;
ctx->probelist[ctx->num_enabled_probes] = 0;
ctx->header = g_string_sized_new(512); ctx->header = g_string_sized_new(512);
num_probes = g_slist_length(o->sdi->probes); num_probes = g_slist_length(o->sdi->probes);
@ -131,9 +128,12 @@ static int init(struct sr_output *o)
g_string_append_printf(ctx->header, "$scope module %s $end\n", PACKAGE); g_string_append_printf(ctx->header, "$scope module %s $end\n", PACKAGE);
/* Wires / channels */ /* Wires / channels */
for (i = 0; i < ctx->num_enabled_probes; i++) { for (i = 0, l = o->sdi->probes; l; l = l->next, i++) {
probe = l->data;
if (!probe->enabled)
continue;
g_string_append_printf(ctx->header, "$var wire 1 %c %s $end\n", g_string_append_printf(ctx->header, "$var wire 1 %c %s $end\n",
(char)('!' + i), ctx->probelist[i]); (char)('!' + i), probe->name);
} }
g_string_append(ctx->header, "$upscope $end\n" g_string_append(ctx->header, "$upscope $end\n"