X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fsession_driver.c;h=3b801ffcb36dcada6fe6c3b55ef2c5a335034f21;hb=1c47e0da8f2571bc34dbdc368c3c1f55318c3aa0;hp=dc2fb1ebc44c70d3cd00284bedad589895658f64;hpb=2dc4081540c23e37f7a9203f4d8990a1f0733103;p=libsigrok.git

diff --git a/src/session_driver.c b/src/session_driver.c
index dc2fb1eb..3b801ffc 100644
--- a/src/session_driver.c
+++ b/src/session_driver.c
@@ -74,10 +74,11 @@ static gboolean stream_session_data(struct sr_dev_inst *sdi)
 
 	got_data = FALSE;
 	vdev = sdi->priv;
+
 	if (!vdev->capfile) {
 		/* No capture file opened yet, or finished with the last
 		 * chunked one. */
-		if (vdev->cur_chunk == 0) {
+		if (vdev->capturefile && (vdev->cur_chunk == 0)) {
 			/* capturefile is always the unchunked base name. */
 			if (zip_stat(vdev->archive, vdev->capturefile, 0, &zs) != -1) {
 				/* No chunks, just a single capture file. */
@@ -113,7 +114,7 @@ static gboolean stream_session_data(struct sr_dev_inst *sdi)
 				sr_dbg("Opened %s.", capturefile);
 			} else if (vdev->cur_analog_channel < vdev->num_analog_channels) {
 				vdev->capturefile = g_strdup_printf("analog-1-%d",
-						vdev->cur_analog_channel + 1);
+						vdev->num_channels + vdev->cur_analog_channel + 1);
 				vdev->cur_analog_channel++;
 				vdev->cur_chunk = 0;
 				return TRUE;
@@ -126,8 +127,13 @@ static gboolean stream_session_data(struct sr_dev_inst *sdi)
 
 	buf = g_malloc(CHUNKSIZE);
 
-	ret = zip_fread(vdev->capfile, buf,
-			CHUNKSIZE / vdev->unitsize * vdev->unitsize);
+	/* unitsize is not defined for purely analog session files. */
+	if (vdev->unitsize)
+		ret = zip_fread(vdev->capfile, buf,
+				CHUNKSIZE / vdev->unitsize * vdev->unitsize);
+	else
+		ret = zip_fread(vdev->capfile, buf, CHUNKSIZE);
+
 	if (ret > 0) {
 		got_data = TRUE;
 		if (vdev->cur_analog_channel != 0) {
@@ -172,7 +178,6 @@ static int receive_data(int fd, int revents, void *cb_data)
 {
 	struct sr_dev_inst *sdi;
 	struct session_vdev *vdev;
-	struct sr_datafeed_packet packet;
 
 	(void)fd;
 	(void)revents;
@@ -193,9 +198,8 @@ static int receive_data(int fd, int revents, void *cb_data)
 		zip_discard(vdev->archive);
 		vdev->archive = NULL;
 	}
-	packet.type = SR_DF_END;
-	packet.payload = NULL;
-	sr_session_send(sdi, &packet);
+
+	std_session_send_df_end(sdi, LOG_PREFIX);
 
 	return G_SOURCE_REMOVE;
 }
@@ -363,7 +367,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 		return SR_ERR;
 	}
 
-	/* Send header packet to the session bus. */
 	std_session_send_df_header(sdi, LOG_PREFIX);
 
 	/* freewheeling source */