X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=input%2Finput_binary.c;h=b83ea6f5ea58ed46aad482c19031f2b47fe94416;hb=3b7c8f54fcf4c6de1ec67d11a9ec8975a2ddbb57;hp=2b5580d984d691062cffe78eb6084d96cac24eed;hpb=cdb3573ceba61b02b80f7fc979d166db5b6ff3bc;p=libsigrok.git

diff --git a/input/input_binary.c b/input/input_binary.c
index 2b5580d9..b83ea6f5 100644
--- a/input/input_binary.c
+++ b/input/input_binary.c
@@ -28,12 +28,10 @@
 #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;
@@ -41,17 +39,25 @@ static int format_match(const char *filename)
 
 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 SR_ERR;
-	} else
+	} else {
 		num_probes = DEFAULT_NUM_PROBES;
+	}
 
-	/* create a virtual device */
-	in->vdevice = sr_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 SR_OK;
 }
@@ -60,7 +66,8 @@ static int loadfile(struct sr_input *in, const char *filename)
 {
 	struct sr_datafeed_header header;
 	struct sr_datafeed_packet packet;
-	char buffer[CHUNKSIZE];
+	struct sr_datafeed_logic logic;
+	unsigned char buffer[CHUNKSIZE];
 	int fd, size, num_probes;
 
 	if ((fd = open(filename, O_RDONLY)) == -1)
@@ -72,27 +79,25 @@ static int loadfile(struct sr_input *in, const char *filename)
 	header.feed_version = 1;
 	header.num_logic_probes = num_probes;
 	header.num_analog_probes = 0;
-	header.protocol_id = SR_PROTO_RAW;
 	header.samplerate = 0;
 	gettimeofday(&header.starttime, NULL);
 	packet.type = SR_DF_HEADER;
-	packet.length = sizeof(struct sr_datafeed_header);
 	packet.payload = &header;
 	sr_session_bus(in->vdevice, &packet);
 
 	/* chop up the input file into chunks and feed it into the session bus */
 	packet.type = SR_DF_LOGIC;
-	packet.unitsize = (num_probes + 7) / 8;
-	packet.payload = buffer;
+	packet.payload = &logic;
+	logic.unitsize = (num_probes + 7) / 8;
+	logic.data = buffer;
 	while ((size = read(fd, buffer, CHUNKSIZE)) > 0) {
-		packet.length = size;
+		logic.length = size;
 		sr_session_bus(in->vdevice, &packet);
 	}
 	close(fd);
 
 	/* end of stream */
 	packet.type = SR_DF_END;
-	packet.length = 0;
 	sr_session_bus(in->vdevice, &packet);
 
 	return SR_OK;