X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=input%2Fchronovu_la8.c;h=4c7854272aecea801734d2989c7ae2236ba08996;hb=3544f848e0d7f67af8e11ce7ec344b34cd797df3;hp=146d9da9d581154c2caf029e1c58eaf0d9f1ca24;hpb=8e7f1cfd99a37d21ebe3365067cd21b76e866d1c;p=libsigrok.git

diff --git a/input/chronovu_la8.c b/input/chronovu_la8.c
index 146d9da9..4c785427 100644
--- a/input/chronovu_la8.c
+++ b/input/chronovu_la8.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2011 Uwe Hermann <uwe@hermann-uwe.de>
  *
@@ -25,14 +25,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "input/chronovu-la8: "
-#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
-#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+#define LOG_PREFIX "input/chronovu-l8"
 
 #define NUM_PACKETS		2048
 #define PACKET_SIZE		4096
@@ -101,13 +94,15 @@ static int format_match(const char *filename)
 	return TRUE;
 }
 
-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;
 	char name[SR_MAX_PROBENAME_LEN + 1];
 	char *param;
 
+	(void)filename;
+
 	num_probes = DEFAULT_NUM_PROBES;
 
 	if (in->param) {
@@ -137,10 +132,10 @@ static int init(struct sr_input *in)
 
 static int loadfile(struct sr_input *in, const char *filename)
 {
-	struct sr_datafeed_header header;
 	struct sr_datafeed_packet packet;
-	struct sr_datafeed_meta_logic meta;
+	struct sr_datafeed_meta meta;
 	struct sr_datafeed_logic logic;
+	struct sr_config *src;
 	uint8_t buf[PACKET_SIZE], divcount;
 	int i, fd, size, num_probes;
 	uint64_t samplerate;
@@ -165,19 +160,15 @@ static int loadfile(struct sr_input *in, const char *filename)
 	sr_dbg("%s: samplerate is %" PRIu64, __func__, samplerate);
 
 	/* Send header packet to the session bus. */
-	sr_dbg("%s: sending SR_DF_HEADER packet", __func__);
-	packet.type = SR_DF_HEADER;
-	packet.payload = &header;
-	header.feed_version = 1;
-	gettimeofday(&header.starttime, NULL);
-	sr_session_send(in->sdi, &packet);
+	std_session_send_df_header(in->sdi, LOG_PREFIX);
 
 	/* Send metadata about the SR_DF_LOGIC packets to come. */
-	packet.type = SR_DF_META_LOGIC;
+	packet.type = SR_DF_META;
 	packet.payload = &meta;
-	meta.samplerate = samplerate;
-	meta.num_probes = num_probes;
+	src = sr_config_new(SR_CONF_SAMPLERATE, g_variant_new_uint64(samplerate));
+	meta.config = g_slist_append(NULL, src);
 	sr_session_send(in->sdi, &packet);
+	sr_config_free(src);
 
 	/* TODO: Handle trigger point. */