X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=input%2Finput_binary.c;h=8160c7c1046d919037c3f936d31633bdab3b475a;hb=b9c735a275512ce82da7f66275c7cb62eaf66b60;hp=27e8fa4d34a5b8d315575dafca51919b1436bb14;hpb=db91a1c3c1e798610542b9749191fc89f15c5ccd;p=libsigrok.git

diff --git a/input/input_binary.c b/input/input_binary.c
index 27e8fa4d..8160c7c1 100644
--- a/input/input_binary.c
+++ b/input/input_binary.c
@@ -17,72 +17,91 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/time.h>
-
 #include <sigrok.h>
 
-#define CHUNKSIZE 4096
+#define CHUNKSIZE          4096
+#define DEFAULT_NUM_PROBES    8
 
 
-static int format_match(char *filename)
+static int format_match(const char *filename)
 {
 
+	/* suppress compiler warning */
 	filename = NULL;
 
+	/* this module will handle anything you throw at it */
 	return TRUE;
 }
 
+static int init(struct sr_input *in)
+{
+	int num_probes;
+
+	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;
 
-static int in_loadfile(char *filename)
+	/* create a virtual device */
+	in->vdevice = device_new(NULL, 0, num_probes);
+
+	return SR_OK;
+}
+
+static int loadfile(struct sr_input *in, const char *filename)
 {
-	struct datafeed_header header;
-	struct datafeed_packet packet;
-	struct device *device;
+	struct sr_datafeed_header header;
+	struct sr_datafeed_packet packet;
 	char buffer[CHUNKSIZE];
 	int fd, size, num_probes;
 
-	if( (fd = open(filename, O_RDONLY)) == -1)
-		return SIGROK_ERR;
+	if ((fd = open(filename, O_RDONLY)) == -1)
+		return SR_ERR;
 
-	/* TODO: number of probes hardcoded to 8 */
-	num_probes = 8;
-	device = device_new(NULL, 0, num_probes);
+	num_probes = g_slist_length(in->vdevice->probes);
 
+	/* send header */
 	header.feed_version = 1;
-	header.num_probes = num_probes;
+	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.length = sizeof(struct sr_datafeed_header);
 	packet.payload = &header;
-	session_bus(device, &packet);
+	session_bus(in->vdevice, &packet);
 
-	packet.type = DF_LOGIC8;
+	/* 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;
-	while( (size = read(fd, buffer, CHUNKSIZE)) > 0) {
+	while ((size = read(fd, buffer, CHUNKSIZE)) > 0) {
 		packet.length = size;
-		session_bus(device, &packet);
+		session_bus(in->vdevice, &packet);
 	}
 	close(fd);
 
+	/* end of stream */
 	packet.type = DF_END;
 	packet.length = 0;
-	session_bus(device, &packet);
-
+	session_bus(in->vdevice, &packet);
 
-	return SIGROK_OK;
+	return SR_OK;
 }
 
-
-struct input_format input_binary = {
-		"binary",
-		"Raw binary",
-		format_match,
-		in_loadfile
+struct sr_input_format input_binary = {
+	"binary",
+	"Raw binary",
+	format_match,
+	init,
+	loadfile,
 };
-