X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=input%2Fbinary.c;h=8348ea82dd9870a6aa223c6fcc804dc5fe4ad0c2;hb=a2e464604ca19c1a41b8e94625971eb3818c9090;hp=9172eb8e8fc66bbd5d919ce6d9b3130011ea25a0;hpb=5c64390e5ac8a0052d8b7eeb49c781d86027c814;p=libsigrok.git

diff --git a/input/binary.c b/input/binary.c
index 9172eb8e..8348ea82 100644
--- a/input/binary.c
+++ b/input/binary.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of the sigrok project.
  *
- * Copyright (C) 2010 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2010-2012 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
@@ -23,11 +23,16 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/time.h>
-#include "sigrok.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 
 #define CHUNKSIZE             (512 * 1024)
 #define DEFAULT_NUM_PROBES    8
 
+struct context {
+	uint64_t samplerate;
+};
+
 static int format_match(const char *filename)
 {
 	/* suppress compiler warning */
@@ -39,24 +44,45 @@ static int format_match(const char *filename)
 
 static int init(struct sr_input *in)
 {
+	struct sr_probe *probe;
 	int num_probes, i;
 	char name[SR_MAX_PROBENAME_LEN + 1];
+	char *param;
+	struct context *ctx;
 
-	if (in->param && in->param[0]) {
-		num_probes = strtoul(in->param, NULL, 10);
-		if (num_probes < 1)
-			return SR_ERR;
-	} else {
-		num_probes = DEFAULT_NUM_PROBES;
+	if (!(ctx = g_try_malloc0(sizeof(*ctx)))) {
+		sr_err("binary in: %s: ctx malloc failed", __func__);
+		return SR_ERR_MALLOC;
+	}
+
+	num_probes = DEFAULT_NUM_PROBES;
+	ctx->samplerate = 0;
+
+	if(in->param) {
+		param = g_hash_table_lookup(in->param, "numprobes");
+		if (param) {
+			num_probes = strtoul(param, NULL, 10);
+			if (num_probes < 1)
+				return SR_ERR;
+		}
+
+		param = g_hash_table_lookup(in->param, "samplerate");
+		if (param) {
+			if (sr_parse_sizestring(param, &ctx->samplerate) != SR_OK)
+				return SR_ERR;
+		}
 	}
 
 	/* Create a virtual device. */
-	in->vdevice = sr_device_new(NULL, 0);
+	in->sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, NULL, NULL, NULL);
+	in->internal = ctx;
 
 	for (i = 0; i < num_probes; i++) {
 		snprintf(name, SR_MAX_PROBENAME_LEN, "%d", i);
 		/* TODO: Check return value. */
-		sr_device_probe_add(in->vdevice, name);
+		if (!(probe = sr_probe_new(i, SR_PROBE_LOGIC, TRUE, name)))
+			return SR_ERR;
+		in->sdi->probes = g_slist_append(in->sdi->probes, probe);
 	}
 
 	return SR_OK;
@@ -66,23 +92,32 @@ 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_logic logic;
 	unsigned char buffer[CHUNKSIZE];
 	int fd, size, num_probes;
+	struct context *ctx;
+
+	ctx = in->internal;
 
 	if ((fd = open(filename, O_RDONLY)) == -1)
 		return SR_ERR;
 
-	num_probes = g_slist_length(in->vdevice->probes);
+	num_probes = g_slist_length(in->sdi->probes);
 
 	/* send header */
 	header.feed_version = 1;
-	header.num_logic_probes = num_probes;
-	header.samplerate = 0;
 	gettimeofday(&header.starttime, NULL);
 	packet.type = SR_DF_HEADER;
 	packet.payload = &header;
-	sr_session_bus(in->vdevice, &packet);
+	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);
 
 	/* chop up the input file into chunks and feed it into the session bus */
 	packet.type = SR_DF_LOGIC;
@@ -91,18 +126,21 @@ static int loadfile(struct sr_input *in, const char *filename)
 	logic.data = buffer;
 	while ((size = read(fd, buffer, CHUNKSIZE)) > 0) {
 		logic.length = size;
-		sr_session_bus(in->vdevice, &packet);
+		sr_session_send(in->sdi, &packet);
 	}
 	close(fd);
 
 	/* end of stream */
 	packet.type = SR_DF_END;
-	sr_session_bus(in->vdevice, &packet);
+	sr_session_send(in->sdi, &packet);
+
+	g_free(ctx);
+	in->internal = NULL;
 
 	return SR_OK;
 }
 
-struct sr_input_format input_binary = {
+SR_PRIV struct sr_input_format input_binary = {
 	.id = "binary",
 	.description = "Raw binary",
 	.format_match = format_match,