X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session_driver.c;h=fe9765edee82039ed397fec330dae94963f57281;hb=b7f09cf86dd57a59dc1bdece2cac9e4a176900b1;hp=f0b4b0f98529f12a4d857497a05359d08018d71b;hpb=9c939c5132d82575cc1ce8f8fef5b6c4289aec5b;p=libsigrok.git

diff --git a/session_driver.c b/session_driver.c
index f0b4b0f9..fe9765ed 100644
--- a/session_driver.c
+++ b/session_driver.c
@@ -23,8 +23,8 @@
 #include <unistd.h>
 #include <sys/time.h>
 #include <zip.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
 
 /* size of payloads sent across the session bus */
 #define CHUNKSIZE 4096
@@ -33,6 +33,7 @@ struct session_vdevice {
 	char *capturefile;
 	struct zip *archive;
 	struct zip_file *capfile;
+	int bytes_read;
 	uint64_t samplerate;
 	int unitsize;
 	int num_probes;
@@ -46,7 +47,6 @@ static int capabilities[] = {
 	0,
 };
 
-
 static struct session_vdevice *get_vdevice_by_index(int device_index)
 {
 	struct sr_device_instance *sdi;
@@ -66,13 +66,14 @@ static int feed_chunk(int fd, int revents, void *session_data)
 	struct session_vdevice *vdevice;
 	struct sr_datafeed_packet packet;
 	struct sr_datafeed_logic logic;
+	uint64_t sample_period_ps;
 	GSList *l;
 	void *buf;
 	int ret, got_data;
 
-	/* avoid compiler warning */
-	fd = fd;
-	revents = revents;
+	/* Avoid compiler warnings. */
+	(void)fd;
+	(void)revents;
 
 	sr_dbg("session_driver: feed chunk");
 
@@ -94,12 +95,14 @@ static int feed_chunk(int fd, int revents, void *session_data)
 		if (ret > 0) {
 			got_data = TRUE;
 			packet.type = SR_DF_LOGIC;
-			packet.timeoffset = 0;
-			packet.duration = 0;
+			sample_period_ps = 1000000000000 / vdevice->samplerate;
+			packet.timeoffset = sample_period_ps * (vdevice->bytes_read / vdevice->unitsize);
+			packet.duration = sample_period_ps * (ret / vdevice->unitsize);
 			packet.payload = &logic;
 			logic.length = ret;
 			logic.unitsize = vdevice->unitsize;
 			logic.data = buf;
+			vdevice->bytes_read += ret;
 			sr_session_bus(session_data, &packet);
 		} else {
 			/* done with this capture file */
@@ -119,9 +122,11 @@ static int feed_chunk(int fd, int revents, void *session_data)
 }
 
 /* driver callbacks */
+static void hw_cleanup(void);
 
 static int hw_init(const char *deviceinfo)
 {
+	hw_cleanup();
 
 	sessionfile = g_strdup(deviceinfo);
 
@@ -135,8 +140,12 @@ static void hw_cleanup(void)
 	for (l = device_instances; l; l = l->next)
 		sr_device_instance_free(l->data);
 
-	g_free(sessionfile);
+	g_slist_free(device_instances);
+	device_instances = NULL;
+
+	sr_session_source_remove(-1);
 
+	g_free(sessionfile);
 }
 
 static int hw_opendev(int device_index)
@@ -176,11 +185,10 @@ static void *hw_get_device_info(int device_index, int device_info_id)
 
 static int hw_get_status(int device_index)
 {
+	/* Avoid compiler warnings. */
+	(void)device_index;
 
-	/* avoid compiler warning */
-	device_index = device_index;
-
-	if (devices)
+	if (sr_device_list() != NULL)
 		return SR_OK;
 	else
 		return SR_ERR;
@@ -188,7 +196,6 @@ static int hw_get_status(int device_index)
 
 static int *hw_get_capabilities(void)
 {
-
 	return capabilities;
 }
 
@@ -231,8 +238,8 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 	struct sr_datafeed_packet *packet;
 	int err;
 
-	/* avoid compiler warning */
-	session_device_id = session_device_id;
+	/* Avoid compiler warnings. */
+	(void)session_device_id;
 
 	if (!(vdevice = get_vdevice_by_index(device_index)))
 		return SR_ERR;
@@ -276,7 +283,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 	packet->payload = (unsigned char *)header;
 	header->feed_version = 1;
 	gettimeofday(&header->starttime, NULL);
-	header->samplerate = 0;
+	header->samplerate = vdevice->samplerate;
 	header->num_logic_probes = vdevice->num_probes;
 	header->num_analog_probes = 0;
 	sr_session_bus(session_device_id, packet);
@@ -286,6 +293,7 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 	return SR_OK;
 }
 
+/* Not static, it's used elsewhere (via 'extern'). */
 struct sr_device_plugin session_driver = {
 	"session",
 	"Session-emulating driver",