X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=input%2Fbinary.c;h=1c786baebfc2c71ec6b833fa35ee7f16b476deea;hb=4afdfd4628e9955af02a3ea619ecdfe469f9a9e2;hp=8348ea82dd9870a6aa223c6fcc804dc5fe4ad0c2;hpb=5c3c1241d2e2b5d456865e876490492d76174257;p=libsigrok.git

diff --git a/input/binary.c b/input/binary.c
index 8348ea82..1c786bae 100644
--- a/input/binary.c
+++ b/input/binary.c
@@ -26,6 +26,15 @@
 #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)
+
 #define CHUNKSIZE             (512 * 1024)
 #define DEFAULT_NUM_PROBES    8
 
@@ -35,10 +44,9 @@ struct context {
 
 static int format_match(const char *filename)
 {
-	/* suppress compiler warning */
 	(void)filename;
 
-	/* this module will handle anything you throw at it */
+	/* This module will handle anything you throw at it. */
 	return TRUE;
 }
 
@@ -51,14 +59,14 @@ static int init(struct sr_input *in)
 	struct context *ctx;
 
 	if (!(ctx = g_try_malloc0(sizeof(*ctx)))) {
-		sr_err("binary in: %s: ctx malloc failed", __func__);
+		sr_err("Input format context malloc failed.");
 		return SR_ERR_MALLOC;
 	}
 
 	num_probes = DEFAULT_NUM_PROBES;
 	ctx->samplerate = 0;
 
-	if(in->param) {
+	if (in->param) {
 		param = g_hash_table_lookup(in->param, "numprobes");
 		if (param) {
 			num_probes = strtoul(param, NULL, 10);
@@ -90,10 +98,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;
 	unsigned char buffer[CHUNKSIZE];
 	int fd, size, num_probes;
 	struct context *ctx;
@@ -105,21 +113,18 @@ static int loadfile(struct sr_input *in, const char *filename)
 
 	num_probes = g_slist_length(in->sdi->probes);
 
-	/* send header */
-	header.feed_version = 1;
-	gettimeofday(&header.starttime, NULL);
-	packet.type = SR_DF_HEADER;
-	packet.payload = &header;
-	sr_session_send(in->sdi, &packet);
+	/* Send header packet to the session bus. */
+	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_LOGIC;
-	packet.payload = &meta;
-	meta.samplerate = ctx->samplerate;
-	meta.num_probes = num_probes;
-	sr_session_send(in->sdi, &packet);
+	if (ctx->samplerate) {
+		packet.type = SR_DF_META;
+		packet.payload = &meta;
+		src = sr_config_make(SR_CONF_SAMPLERATE, (const void *)&ctx->samplerate);
+		meta.config = g_slist_append(NULL, src);
+		sr_session_send(in->sdi, &packet);
+	}
 
-	/* chop up the input file into chunks and feed it into the session bus */
+	/* Chop up the input file into chunks & send it to the session bus. */
 	packet.type = SR_DF_LOGIC;
 	packet.payload = &logic;
 	logic.unitsize = (num_probes + 7) / 8;
@@ -130,7 +135,7 @@ static int loadfile(struct sr_input *in, const char *filename)
 	}
 	close(fd);
 
-	/* end of stream */
+	/* Send end packet to the session bus. */
 	packet.type = SR_DF_END;
 	sr_session_send(in->sdi, &packet);