X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=input%2Fchronovu_la8.c;h=9f129be40e490629b831bc8c753da9487341df11;hb=a4eb4b296da9818ffb04bb8023d43f6a006a81ca;hp=d83b547f280fe218b28dcd644435a8e9c4b69f09;hpb=4afdfd4628e9955af02a3ea619ecdfe469f9a9e2;p=libsigrok.git

diff --git a/input/chronovu_la8.c b/input/chronovu_la8.c
index d83b547f..9f129be4 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-la8"
 
 #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) {
@@ -165,14 +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. */
-	std_session_send_df_header(in->sdi, DRIVER_LOG_DOMAIN);
+	std_session_send_df_header(in->sdi, LOG_PREFIX);
 
 	/* Send metadata about the SR_DF_LOGIC packets to come. */
 	packet.type = SR_DF_META;
 	packet.payload = &meta;
-	src = sr_config_make(SR_CONF_SAMPLERATE, (const void *)&samplerate);
+	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. */