X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=input%2Fchronovu_la8.c;h=ceafd4db0a8366b9cab184ad27e6fcf38c77864a;hb=45c59c8bdd01954f9214fe7b869d92c55415d109;hp=875b52bc3da6917e2d6dbc28a32bba733485e6e9;hpb=7b48d6e104fd461b0c12519b70dbd1c6c72824e1;p=libsigrok.git

diff --git a/input/chronovu_la8.c b/input/chronovu_la8.c
index 875b52bc..ceafd4db 100644
--- a/input/chronovu_la8.c
+++ b/input/chronovu_la8.c
@@ -21,8 +21,9 @@
 #include <stdlib.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include "sigrok.h"
-#include "sigrok-internal.h"
+#include <sys/stat.h>
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 
 #define NUM_PACKETS		2048
 #define PACKET_SIZE		4096
@@ -36,6 +37,7 @@
  * Max. value for divcount: 0xfe (2550ns sample period, 392.15kHz samplerate).
  *
  * @param divcount The divcount value as needed by the hardware.
+ *
  * @return The samplerate in Hz, or 0xffffffffffffffff upon errors.
  */
 static uint64_t divcount_to_samplerate(uint8_t divcount)
@@ -48,6 +50,9 @@ static uint64_t divcount_to_samplerate(uint8_t divcount)
 
 static int format_match(const char *filename)
 {
+	struct stat stat_buf;
+	int ret;
+
 	if (!filename) {
 		sr_err("la8 in: %s: filename was NULL", __func__);
 		// return SR_ERR; /* FIXME */
@@ -68,7 +73,19 @@ static int format_match(const char *filename)
 		return FALSE;
 	}
 
-	/* TODO: Only accept files of length 8MB + 5 bytes. */
+	/* Only accept files of length 8MB + 5 bytes. */
+	ret = stat(filename, &stat_buf);
+	if (ret != 0) {
+		sr_err("la8 in: %s: Error getting file size of '%s'",
+		       __func__, filename);
+		return FALSE;
+	}
+	if (stat_buf.st_size != (8 * 1024 * 1024 + 5)) {
+		sr_dbg("la8 in: %s: File size must be exactly 8388613 bytes ("
+		       "it actually is %d bytes in size), so this is not a "
+		       "ChronoVu LA8 file.", __func__, stat_buf.st_size);
+		return FALSE;
+	}
 
 	/* TODO: Check for divcount != 0xff. */
 
@@ -91,12 +108,12 @@ static int init(struct sr_input *in)
 	}
 
 	/* Create a virtual device. */
-	in->vdevice = sr_dev_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_dev_probe_add(in->vdevice, name);
+		sr_dev_probe_add(in->vdev, name);
 	}
 
 	return SR_OK;
@@ -106,6 +123,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;
 	uint8_t buf[PACKET_SIZE], divcount;
 	int i, fd, size, num_probes;
@@ -117,7 +135,7 @@ static int loadfile(struct sr_input *in, const char *filename)
 		return SR_ERR;
 	}
 
-	num_probes = g_slist_length(in->vdevice->probes);
+	num_probes = g_slist_length(in->vdev->probes);
 
 	/* Seek to the end of the file, and read the divcount byte. */
 	divcount = 0x00; /* TODO: Don't hardcode! */
@@ -136,9 +154,14 @@ static int loadfile(struct sr_input *in, const char *filename)
 	packet.payload = &header;
 	header.feed_version = 1;
 	gettimeofday(&header.starttime, NULL);
-	header.num_logic_probes = num_probes;
-	header.samplerate = samplerate;
-	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 = samplerate;
+	meta.num_probes = num_probes;
+	sr_session_send(in->vdev, &packet);
 
 	/* TODO: Handle trigger point. */
 
@@ -153,8 +176,8 @@ static int loadfile(struct sr_input *in, const char *filename)
 	for (i = 0; i < NUM_PACKETS; i++) {
 		/* TODO: Handle errors, handle incomplete reads. */
 		size = read(fd, buf, PACKET_SIZE);
-		logic.length = PACKET_SIZE;
-		sr_session_bus(in->vdevice, &packet);
+		logic.length = size;
+		sr_session_send(in->vdev, &packet);
 	}
 	close(fd); /* FIXME */
 
@@ -162,7 +185,7 @@ static int loadfile(struct sr_input *in, const char *filename)
 	sr_dbg("la8 in: %s: sending SR_DF_END", __func__);
 	packet.type = SR_DF_END;
 	packet.payload = NULL;
-	sr_session_bus(in->vdevice, &packet);
+	sr_session_send(in->vdev, &packet);
 
 	return SR_OK;
 }