X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session_driver.c;h=0b8c1ed26cc2833b646708a6ba55c68cfb2e0903;hb=f8c617cf4c6b649d3456f1ca7082f6cfb6dac76d;hp=3707b3573ec7dc3a97b1ecaad21d882b37475547;hpb=9289e273bb6dfe9e8e46b5598830d4fb293175fc;p=libsigrok.git

diff --git a/session_driver.c b/session_driver.c
index 3707b357..0b8c1ed2 100644
--- a/session_driver.c
+++ b/session_driver.c
@@ -23,13 +23,14 @@
 #include <unistd.h>
 #include <sys/time.h>
 #include <zip.h>
-#include "sigrok.h"
-#include "sigrok-internal.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 
 /* size of payloads sent across the session bus */
 #define CHUNKSIZE (512 * 1024)
 
 struct session_vdev {
+	char *sessionfile;
 	char *capturefile;
 	struct zip *archive;
 	struct zip_file *capfile;
@@ -39,9 +40,8 @@ struct session_vdev {
 	int num_probes;
 };
 
-static char *sessionfile = NULL;
 static GSList *dev_insts = NULL;
-static int hwcaps[] = {
+static const int hwcaps[] = {
 	SR_HWCAP_CAPTUREFILE,
 	SR_HWCAP_CAPTURE_UNITSIZE,
 	0,
@@ -148,11 +148,10 @@ static int hw_cleanup(void);
  *
  * @return TODO.
  */
-static int hw_init(const char *devinfo)
+static int hw_init(void)
 {
-	sessionfile = g_strdup(devinfo);
 
-	return 0;
+	return SR_OK;
 }
 
 /**
@@ -169,8 +168,6 @@ static int hw_cleanup(void)
 
 	sr_session_source_remove(-1);
 
-	g_free(sessionfile);
-
 	return SR_OK;
 }
 
@@ -193,7 +190,7 @@ static int hw_dev_open(int dev_index)
 	return SR_OK;
 }
 
-static void *hw_dev_info_get(int dev_index, int dev_info_id)
+static const void *hw_dev_info_get(int dev_index, int dev_info_id)
 {
 	struct session_vdev *vdev;
 	void *info;
@@ -226,15 +223,15 @@ static int hw_dev_status_get(int dev_index)
  * @return A pointer to the (hardware) capabilities of this virtual session
  *         driver. This could be NULL, if no such capabilities exist.
  */
-static int *hw_hwcap_get_all(void)
+static const int *hw_hwcap_get_all(void)
 {
 	return hwcaps;
 }
 
-static int hw_dev_config_set(int dev_index, int hwcap, void *value)
+static int hw_dev_config_set(int dev_index, int hwcap, const void *value)
 {
 	struct session_vdev *vdev;
-	uint64_t *tmp_u64;
+	const uint64_t *tmp_u64;
 
 	if (!(vdev = get_vdev_by_index(dev_index)))
 		return SR_ERR;
@@ -246,6 +243,11 @@ static int hw_dev_config_set(int dev_index, int hwcap, void *value)
 		sr_info("session driver: setting samplerate to %" PRIu64,
 		        vdev->samplerate);
 		break;
+	case SR_HWCAP_SESSIONFILE:
+		vdev->sessionfile = g_strdup(value);
+		sr_info("session driver: setting sessionfile to %s",
+		        vdev->sessionfile);
+		break;
 	case SR_HWCAP_CAPTUREFILE:
 		vdev->capturefile = g_strdup(value);
 		sr_info("session driver: setting capturefile to %s",
@@ -274,29 +276,30 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
 	struct session_vdev *vdev;
 	struct sr_datafeed_header *header;
 	struct sr_datafeed_packet *packet;
-	int err;
+	struct sr_datafeed_meta_logic meta;
+	int ret;
 
 	if (!(vdev = get_vdev_by_index(dev_index)))
 		return SR_ERR;
 
-	sr_info("session_driver: opening archive %s file %s", sessionfile,
+	sr_info("session_driver: opening archive %s file %s", vdev->sessionfile,
 		vdev->capturefile);
 
-	if (!(vdev->archive = zip_open(sessionfile, 0, &err))) {
+	if (!(vdev->archive = zip_open(vdev->sessionfile, 0, &ret))) {
 		sr_err("session driver: Failed to open session file '%s': "
-		       "zip error %d\n", sessionfile, err);
+		       "zip error %d\n", vdev->sessionfile, ret);
 		return SR_ERR;
 	}
 
 	if (zip_stat(vdev->archive, vdev->capturefile, 0, &zs) == -1) {
 		sr_err("session driver: Failed to check capture file '%s' in "
-		       "session file '%s'.", vdev->capturefile, sessionfile);
+		       "session file '%s'.", vdev->capturefile, vdev->sessionfile);
 		return SR_ERR;
 	}
 
 	if (!(vdev->capfile = zip_fopen(vdev->archive, vdev->capturefile, 0))) {
 		sr_err("session driver: Failed to open capture file '%s' in "
-		       "session file '%s'.", vdev->capturefile, sessionfile);
+		       "session file '%s'.", vdev->capturefile, vdev->sessionfile);
 		return SR_ERR;
 	}
 
@@ -318,9 +321,15 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
 	packet->payload = (unsigned char *)header;
 	header->feed_version = 1;
 	gettimeofday(&header->starttime, NULL);
-	header->samplerate = vdev->samplerate;
-	header->num_logic_probes = vdev->num_probes;
 	sr_session_send(cb_data, packet);
+
+	/* Send metadata about the SR_DF_LOGIC packets to come. */
+	packet->type = SR_DF_META_LOGIC;
+	packet->payload = &meta;
+	meta.samplerate = vdev->samplerate;
+	meta.num_probes = vdev->num_probes;
+	sr_session_send(cb_data, packet);
+
 	g_free(header);
 	g_free(packet);