X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=input%2Fbinary.c;h=16081776a77ff264cbbf0b1c7201317702f902b8;hb=45c59c8bdd01954f9214fe7b869d92c55415d109;hp=80820e022c7b64c736a4e4f14f4d7f42d51c0ebe;hpb=8ff6afc95d2a9213b8a583e88e9e1b4eb59aad17;p=libsigrok.git

diff --git a/input/binary.c b/input/binary.c
index 80820e02..16081776 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,7 +23,8 @@
 #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
@@ -51,12 +52,12 @@ static int init(struct sr_input *in)
 	}
 
 	/* Create a virtual device. */
-	in->vdevice = sr_device_new(NULL, 0);
+	in->vdev = sr_dev_new(NULL, 0);
 
 	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);
+		sr_dev_probe_add(in->vdev, name);
 	}
 
 	return SR_OK;
@@ -66,6 +67,7 @@ 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;
@@ -73,17 +75,21 @@ static int loadfile(struct sr_input *in, const char *filename)
 	if ((fd = open(filename, O_RDONLY)) == -1)
 		return SR_ERR;
 
-	num_probes = g_slist_length(in->vdevice->probes);
+	num_probes = g_slist_length(in->vdev->probes);
 
 	/* send header */
 	header.feed_version = 1;
-	header.num_logic_probes = num_probes;
-	header.num_analog_probes = 0;
-	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->vdev, &packet);
+
+	/* Send metadata about the SR_DF_LOGIC packets to come. */
+	packet.type = SR_DF_META_LOGIC;
+	packet.payload = &meta;
+	meta.samplerate = 0;
+	meta.num_probes = num_probes;
+	sr_session_send(in->vdev, &packet);
 
 	/* chop up the input file into chunks and feed it into the session bus */
 	packet.type = SR_DF_LOGIC;
@@ -92,18 +98,18 @@ 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->vdev, &packet);
 	}
 	close(fd);
 
 	/* end of stream */
 	packet.type = SR_DF_END;
-	sr_session_bus(in->vdevice, &packet);
+	sr_session_send(in->vdev, &packet);
 
 	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,