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

input: vcd: allow optional index item 

A $var block can have an optional index item which looks like '[<sth>]'.
Parse it, too, and append it to the channel name.

This fixes bug #322. A first version was posted by Simon Richter. This
version is rebased and simplified.

Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
Wolfram Sang 2015-12-30 22:04:38 +01:00 committed by Uwe Hermann
parent 650847e7d3
commit e85e550d92
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/input/vcd.c
View File

@ -206,25 +206,33 @@ static gboolean parse_header(const struct sr_input *in, GString *buf)
sr_err("Parsing timescale failed."); sr_err("Parsing timescale failed.");
} }
} else if (g_strcmp0(name, "var") == 0) { } else if (g_strcmp0(name, "var") == 0) {
/* Format: $var type size identifier reference $end */ /* Format: $var type size identifier reference [opt. index] $end */
unsigned int length;
parts = g_strsplit_set(contents, " \r\n\t", 0); parts = g_strsplit_set(contents, " \r\n\t", 0);
remove_empty_parts(parts); remove_empty_parts(parts);
length = g_strv_length(parts);
if (g_strv_length(parts) != 4) if (length != 4 && length != 5)
sr_warn("$var section should have 4 items"); sr_warn("$var section should have 4 or 5 items");
else if (g_strcmp0(parts[0], "reg") != 0 && g_strcmp0(parts[0], "wire") != 0) else if (g_strcmp0(parts[0], "reg") != 0 && g_strcmp0(parts[0], "wire") != 0)
sr_info("Unsupported signal type: '%s'", parts[0]); sr_info("Unsupported signal type: '%s'", parts[0]);
else if (strtol(parts[1], NULL, 10) != 1) else if (strtol(parts[1], NULL, 10) != 1)
sr_info("Unsupported signal size: '%s'", parts[1]); sr_info("Unsupported signal size: '%s'", parts[1]);
else if (inc->channelcount >= inc->maxchannels) else if (inc->channelcount >= inc->maxchannels)
sr_warn("Skipping '%s' because only %d channels requested.", sr_warn("Skipping '%s%s' because only %d channels requested.",
parts[3], inc->maxchannels); parts[3], parts[4] ? : "", inc->maxchannels);
else { else {
sr_info("Channel %d is '%s' identified by '%s'.",
inc->channelcount, parts[3], parts[2]);
vcd_ch = g_malloc(sizeof(struct vcd_channel)); vcd_ch = g_malloc(sizeof(struct vcd_channel));
vcd_ch->identifier = g_strdup(parts[2]); vcd_ch->identifier = g_strdup(parts[2]);
vcd_ch->name = g_strdup(parts[3]); if (length == 4)
vcd_ch->name = g_strdup(parts[3]);
else
vcd_ch->name = g_strconcat(parts[3], parts[4], NULL);
sr_info("Channel %d is '%s' identified by '%s'.",
inc->channelcount, vcd_ch->name, vcd_ch->identifier);
inc->channels = g_slist_append(inc->channels, vcd_ch); inc->channels = g_slist_append(inc->channels, vcd_ch);
inc->channelcount++; inc->channelcount++;
} }