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

diff --git a/src/session_driver.c b/src/session_driver.c
index 21ba7111..3b801ffc 100644
--- a/src/session_driver.c
+++ b/src/session_driver.c
@@ -47,6 +47,7 @@ struct session_vdev {
 	int num_channels;
 	int num_analog_channels;
 	int cur_analog_channel;
+	GArray *analog_channels;
 	int cur_chunk;
 	gboolean finished;
 };
@@ -65,6 +66,7 @@ static gboolean stream_session_data(struct sr_dev_inst *sdi)
 	struct session_vdev *vdev;
 	struct sr_datafeed_packet packet;
 	struct sr_datafeed_logic logic;
+	struct sr_datafeed_analog_old analog;
 	struct zip_stat zs;
 	int ret, got_data;
 	char capturefile[16];
@@ -72,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. */
@@ -111,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;
@@ -124,18 +127,36 @@ 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) {
-		if (ret % vdev->unitsize != 0)
-			sr_warn("Read size %d not a multiple of the"
-				" unit size %d.", ret, vdev->unitsize);
 		got_data = TRUE;
-		packet.type = SR_DF_LOGIC;
-		packet.payload = &logic;
-		logic.length = ret;
-		logic.unitsize = vdev->unitsize;
-		logic.data = buf;
+		if (vdev->cur_analog_channel != 0) {
+			packet.type = SR_DF_ANALOG_OLD;
+			packet.payload = &analog;
+			analog.channels = g_slist_prepend(NULL,
+					g_array_index(vdev->analog_channels,
+						struct sr_channel *, vdev->cur_analog_channel - 1));
+			analog.num_samples = ret / sizeof(float);
+			analog.mq = SR_MQ_VOLTAGE;
+			analog.unit = SR_UNIT_VOLT;
+			analog.mqflags = SR_MQFLAG_DC;
+			analog.data = (float *) buf;
+		} else {
+			if (ret % vdev->unitsize != 0)
+				sr_warn("Read size %d not a multiple of the"
+					" unit size %d.", ret, vdev->unitsize);
+			packet.type = SR_DF_LOGIC;
+			packet.payload = &logic;
+			logic.length = ret;
+			logic.unitsize = vdev->unitsize;
+			logic.data = buf;
+		}
 		vdev->bytes_read += ret;
 		sr_session_send(sdi, &packet);
 	} else {
@@ -157,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;
@@ -178,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;
 }
@@ -321,12 +340,21 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 {
 	struct session_vdev *vdev;
 	int ret;
+	GSList *l;
+	struct sr_channel *ch;
 
 	(void)cb_data;
 
 	vdev = sdi->priv;
 	vdev->bytes_read = 0;
 	vdev->cur_analog_channel = 0;
+	vdev->analog_channels = g_array_sized_new(FALSE, FALSE,
+			sizeof(struct sr_channel *), vdev->num_analog_channels);
+	for (l = sdi->channels; l; l = l->next) {
+		ch = l->data;
+		if (ch->type == SR_CHANNEL_ANALOG)
+			g_array_append_val(vdev->analog_channels, ch);
+	}
 	vdev->cur_chunk = 0;
 	vdev->finished = FALSE;
 
@@ -339,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 */