X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=input%2Finput_binary.c;h=9d7e1560a4dbcdd0187c3a0222baeeea765f9ab6;hb=cd315a80d87a24a19a7846497d74c5ca85d494a0;hp=ef9bddcb7e017dab9bc4c9f7d30cda3e8ee0f524;hpb=6ea7e23526b6be4d6c762b1136e361e4d3caccf6;p=libsigrok.git

diff --git a/input/input_binary.c b/input/input_binary.c
index ef9bddcb..9d7e1560 100644
--- a/input/input_binary.c
+++ b/input/input_binary.c
@@ -23,48 +23,55 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/time.h>
-#include <sigrok.h>
+#include "sigrok.h"
 
 #define CHUNKSIZE          4096
 #define DEFAULT_NUM_PROBES    8
 
-
 static int format_match(const char *filename)
 {
-
 	/* suppress compiler warning */
-	filename = NULL;
+	(void)filename;
 
 	/* this module will handle anything you throw at it */
 	return TRUE;
 }
 
-static int init(struct input *in)
+static int init(struct sr_input *in)
 {
-	int num_probes;
+	int num_probes, i;
+	char name[SR_MAX_PROBENAME_LEN + 1];
 
 	if (in->param && in->param[0]) {
 		num_probes = strtoul(in->param, NULL, 10);
 		if (num_probes < 1)
-			return SIGROK_ERR;
-	} else
+			return SR_ERR;
+	} else {
 		num_probes = DEFAULT_NUM_PROBES;
+	}
 
-	/* create a virtual device */
-	in->vdevice = device_new(NULL, 0, num_probes);
+	/* Create a virtual device. */
+	in->vdevice = sr_device_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);
+	}
 
-	return SIGROK_OK;
+	return SR_OK;
 }
 
-static int loadfile(struct input *in, const char *filename)
+static int loadfile(struct sr_input *in, const char *filename)
 {
-	struct datafeed_header header;
-	struct datafeed_packet packet;
-	char buffer[CHUNKSIZE];
+	struct sr_datafeed_header header;
+	struct sr_datafeed_packet packet;
+	struct sr_datafeed_logic logic;
+	unsigned char buffer[CHUNKSIZE];
 	int fd, size, num_probes;
 
 	if ((fd = open(filename, O_RDONLY)) == -1)
-		return SIGROK_ERR;
+		return SR_ERR;
 
 	num_probes = g_slist_length(in->vdevice->probes);
 
@@ -72,36 +79,34 @@ static int loadfile(struct input *in, const char *filename)
 	header.feed_version = 1;
 	header.num_logic_probes = num_probes;
 	header.num_analog_probes = 0;
-	header.protocol_id = PROTO_RAW;
 	header.samplerate = 0;
 	gettimeofday(&header.starttime, NULL);
-	packet.type = DF_HEADER;
-	packet.length = sizeof(struct datafeed_header);
+	packet.type = SR_DF_HEADER;
 	packet.payload = &header;
-	session_bus(in->vdevice, &packet);
+	sr_session_bus(in->vdevice, &packet);
 
 	/* chop up the input file into chunks and feed it into the session bus */
-	packet.type = DF_LOGIC;
-	packet.unitsize = (num_probes + 7) / 8;
-	packet.payload = buffer;
+	packet.type = SR_DF_LOGIC;
+	packet.payload = &logic;
+	logic.unitsize = (num_probes + 7) / 8;
+	logic.data = buffer;
 	while ((size = read(fd, buffer, CHUNKSIZE)) > 0) {
-		packet.length = size;
-		session_bus(in->vdevice, &packet);
+		logic.length = size;
+		sr_session_bus(in->vdevice, &packet);
 	}
 	close(fd);
 
 	/* end of stream */
-	packet.type = DF_END;
-	packet.length = 0;
-	session_bus(in->vdevice, &packet);
+	packet.type = SR_DF_END;
+	sr_session_bus(in->vdevice, &packet);
 
-	return SIGROK_OK;
+	return SR_OK;
 }
 
-struct input_format input_binary = {
-	"binary",
-	"Raw binary",
-	format_match,
-	init,
-	loadfile,
+struct sr_input_format input_binary = {
+	.id = "binary",
+	.description = "Raw binary",
+	.format_match = format_match,
+	.init = init,
+	.loadfile = loadfile,
 };