X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Foutput%2Fvcd.c;h=43020029ba7ab511d4e0c36437afa85e7c061b19;hb=45fcaf2ccad796b4bc4434d81b1d0e23f11a8eae;hp=9d3516b74b30d8d22e9274f7251c1f9525a61af4;hpb=8a174d23427735617d69c7502ed8dcade786bbf9;p=libsigrok.git
diff --git a/src/output/vcd.c b/src/output/vcd.c
index 9d3516b7..43020029 100644
--- a/src/output/vcd.c
+++ b/src/output/vcd.c
@@ -15,22 +15,20 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
+#include
#include
#include
#include
-#include "config.h" /* Needed for PACKAGE and others. */
-#include "libsigrok.h"
+#include
#include "libsigrok-internal.h"
#define LOG_PREFIX "output/vcd"
struct context {
int num_enabled_channels;
- GArray *channelindices;
uint8_t *prevsample;
gboolean header_done;
int period;
@@ -104,7 +102,7 @@ static GString *gen_header(const struct sr_output *o)
/* generator */
g_string_append_printf(header, "$version %s %s $end\n",
- PACKAGE, PACKAGE_VERSION);
+ PACKAGE_NAME, SR_PACKAGE_VERSION_STRING);
g_string_append_printf(header, "$comment\n Acquisition with "
"%d/%d channels", ctx->num_enabled_channels, num_channels);
@@ -130,12 +128,12 @@ static GString *gen_header(const struct sr_output *o)
ctx->period = SR_MHZ(1);
else
ctx->period = SR_KHZ(1);
- frequency_s = sr_period_string(ctx->period);
+ frequency_s = sr_period_string(1, ctx->period);
g_string_append_printf(header, "$timescale %s $end\n", frequency_s);
g_free(frequency_s);
/* scope */
- g_string_append_printf(header, "$scope module %s $end\n", PACKAGE);
+ g_string_append_printf(header, "$scope module %s $end\n", PACKAGE_NAME);
/* Wires / channels */
for (i = 0, l = o->sdi->channels; l; l = l->next, i++) {
@@ -264,6 +262,7 @@ struct sr_output_module output_vcd = {
.name = "VCD",
.desc = "Value Change Dump",
.exts = (const char*[]){"vcd", NULL},
+ .flags = 0,
.options = NULL,
.init = init,
.receive = receive,