X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Foutput_vcd.c;h=509aad0754b7b0075aab2796ee6a0759fb693d70;hb=48ca6b54b0a5e7b0cd5f34fa4066523a1a3cc3a3;hp=4b76de0a088512529f0f89bfd9fbd6e25428f266;hpb=d078d2e5f3842b1915ffa9961654f3aa4ed88e17;p=libsigrok.git

diff --git a/output/output_vcd.c b/output/output_vcd.c
index 4b76de0a..509aad07 100644
--- a/output/output_vcd.c
+++ b/output/output_vcd.c
@@ -23,6 +23,7 @@
 #include <string.h>
 #include <glib.h>
 #include <sigrok.h>
+#include <sigrok-internal.h>
 #include "config.h"
 
 struct context {
@@ -36,16 +37,6 @@ struct context {
 	uint64_t samplerate;
 };
 
-const char *vcd_header = "\
-$date %s $end\n\
-$version %s $end\n%s\
-$timescale %s $end\n\
-$scope module %s $end\n\
-%s\
-$upscope $end\n\
-$enddefinitions $end\n\
-$dumpvars\n";
-
 static const char *vcd_header_comment = "\
 $comment\n  Acquisition with %d/%d probes at %s\n$end\n";
 
@@ -71,7 +62,7 @@ static int init(struct sr_output *o)
 		ctx->probelist[ctx->num_enabled_probes++] = probe->name;
 	}
 	if (ctx->num_enabled_probes > 94) {
-		g_warning("VCD only supports 94 probes.");
+		sr_warn("VCD only supports 94 probes.");
 		return SR_ERR;
 	}
 
@@ -223,10 +214,10 @@ static int data(struct sr_output *o, const char *data_in, uint64_t length_in,
 }
 
 struct sr_output_format output_vcd = {
-	"vcd",
-	"Value Change Dump (VCD)",
-	SR_DF_LOGIC,
-	init,
-	data,
-	event,
+	.id = "vcd",
+	.description = "Value Change Dump (VCD)",
+	.df_type = SR_DF_LOGIC,
+	.init = init,
+	.data = data,
+	.event = event,
 };