X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=input%2Fbinary.c;h=dfeedee7433473ab0be857e83b3dbe3e9382fcc1;hb=471607f0244e93cd67097760431a0dd3d39152eb;hp=6e11cde0844eb5e0562657eafaf9f7511a0e921e;hpb=8e7f1cfd99a37d21ebe3365067cd21b76e866d1c;p=libsigrok.git

diff --git a/input/binary.c b/input/binary.c
index 6e11cde0..dfeedee7 100644
--- a/input/binary.c
+++ b/input/binary.c
@@ -1,7 +1,7 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
- * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2013 Bert Vermeulen <bert@biot.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,14 +26,7 @@
 #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 LOG_PREFIX "input/binary"
 
 #define CHUNKSIZE             (512 * 1024)
 #define DEFAULT_NUM_PROBES    8
@@ -50,7 +43,7 @@ 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;
@@ -58,6 +51,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;
@@ -98,10 +93,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;
@@ -114,18 +109,17 @@ 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. */
-	header.feed_version = 1;
-	gettimeofday(&header.starttime, NULL);
-	packet.type = SR_DF_HEADER;
-	packet.payload = &header;
-	sr_session_send(in->sdi, &packet);
-
-	/* 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);
+	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,
+				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. */
 	packet.type = SR_DF_LOGIC;