X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=input%2Fbinary.c;h=70bad29cd7b020e1f40338eb8e318ab7cd38015e;hb=0dcb0c981eccf8df444a9ab0d49dcacf791930f7;hp=67d42f021c8626a332030b0e8b28b2be50744675;hpb=13d8e03c4f9fb6fe9c5f682ab957173effe42d43;p=libsigrok.git

diff --git a/input/binary.c b/input/binary.c
index 67d42f02..70bad29c 100644
--- a/input/binary.c
+++ b/input/binary.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2013 Bert Vermeulen <bert@biot.com>
  *
@@ -26,14 +26,14 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "input/binary: "
-#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)
+/* Message logging helpers with subsystem-specific prefix string. */
+#define LOG_PREFIX "input/binary: "
+#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
+#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
+#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
+#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
+#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
+#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
 
 #define CHUNKSIZE             (512 * 1024)
 #define DEFAULT_NUM_PROBES    8
@@ -116,14 +116,16 @@ static int loadfile(struct sr_input *in, const char *filename)
 	num_probes = g_slist_length(in->sdi->probes);
 
 	/* 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);
 
 	if (ctx->samplerate) {
 		packet.type = SR_DF_META;
 		packet.payload = &meta;
-		src = sr_config_new(SR_CONF_SAMPLERATE, (const void *)&ctx->samplerate);
+		src = sr_config_new(SR_CONF_SAMPLERATE,
+				g_variant_new_uint64(ctx->samplerate));
 		meta.config = g_slist_append(NULL, src);
 		sr_session_send(in->sdi, &packet);
+		sr_config_free(src);
 	}
 
 	/* Chop up the input file into chunks & send it to the session bus. */