X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=input%2Fchronovu_la8.c;h=b9f14dd308b9143be55b6ca6b08837299141a404;hb=ee7489d23449a3f5a81777fbdb3309dfe22bcecd;hp=9c75a9179208375e9bf89d47a4a1257fb3056399;hpb=44dae539254e324e0330e194f9c775be3d761503;p=libsigrok.git

diff --git a/input/chronovu_la8.c b/input/chronovu_la8.c
index 9c75a917..b9f14dd3 100644
--- a/input/chronovu_la8.c
+++ b/input/chronovu_la8.c
@@ -21,6 +21,7 @@
 #include <stdlib.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <sys/stat.h>
 #include "sigrok.h"
 #include "sigrok-internal.h"
 
@@ -49,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 */
@@ -69,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. */
 
@@ -92,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;
@@ -118,7 +134,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! */
@@ -139,7 +155,7 @@ static int loadfile(struct sr_input *in, const char *filename)
 	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);
 
 	/* TODO: Handle trigger point. */
 
@@ -154,8 +170,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 */
 
@@ -163,7 +179,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;
 }