X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=input%2Fvcd.c;h=814988f7ae2c4aa7388d297a63b4d104a11c1c3b;hb=3ebce226a2672ea4f0788f5f2a222586148aabc1;hp=25192f88fa7894b1850b682c93d03382345ca53a;hpb=2df1e81970b38bd4edb6e219ad295c8a83315797;p=libsigrok.git

diff --git a/input/vcd.c b/input/vcd.c
index 25192f88..814988f7 100644
--- a/input/vcd.c
+++ b/input/vcd.c
@@ -311,7 +311,7 @@ static int format_match(const char *filename)
 	return status;
 }
 
-static int init(struct sr_input *in)
+static int init(struct sr_input *in, const char *filename)
 {
 	struct sr_probe *probe;
 	int num_probes, i;
@@ -319,6 +319,8 @@ static int init(struct sr_input *in)
 	char *param;
 	struct context *ctx;
 
+	(void)filename;
+
 	if (!(ctx = g_try_malloc0(sizeof(*ctx)))) {
 		sr_err("Input format context malloc failed.");
 		return SR_ERR_MALLOC;
@@ -543,7 +545,6 @@ static void parse_contents(FILE *file, const struct sr_dev_inst *sdi, struct con
 
 static int loadfile(struct sr_input *in, const char *filename)
 {
-	struct sr_datafeed_header header;
 	struct sr_datafeed_packet packet;
 	struct sr_datafeed_meta meta;
 	struct sr_config *src;
@@ -564,17 +565,13 @@ static int loadfile(struct sr_input *in, const char *filename)
 	}
 
 	/* Send header packet to the session bus. */
-	header.feed_version = 1;
-	gettimeofday(&header.starttime, NULL);
-	packet.type = SR_DF_HEADER;
-	packet.payload = &header;
-	sr_session_send(in->sdi, &packet);
+	std_session_send_df_header(in->sdi, DRIVER_LOG_DOMAIN);
 
 	/* Send metadata about the SR_DF_LOGIC packets to come. */
 	packet.type = SR_DF_META;
 	packet.payload = &meta;
 	samplerate = ctx->samplerate / ctx->downsample;
-	src = sr_config_make(SR_HWCAP_SAMPLERATE, (const void *)&samplerate);
+	src = sr_config_new(SR_CONF_SAMPLERATE, (const void *)&samplerate);
 	meta.config = g_slist_append(NULL, src);
 	sr_session_send(in->sdi, &packet);