X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fsession_driver.c;h=684a7e539122418695be981fcc4fa21a9692172e;hb=16a1d50a6372725c6b4f5b76175f62a64366bfa0;hp=8efba3edb7729997828514ad34844e6e6044e2b2;hpb=b317d1bbfb83f152f94959588336f4a07328d154;p=libsigrok.git

diff --git a/src/session_driver.c b/src/session_driver.c
index 8efba3ed..684a7e53 100644
--- a/src/session_driver.c
+++ b/src/session_driver.c
@@ -31,7 +31,7 @@
 
 /* size of payloads sent across the session bus */
 /** @cond PRIVATE */
-#define CHUNKSIZE (512 * 1024)
+#define CHUNKSIZE (4 * 1024 * 1024)
 /** @endcond */
 
 SR_PRIV struct sr_dev_driver session_driver_info;
@@ -44,8 +44,10 @@ struct session_vdev {
 	int bytes_read;
 	uint64_t samplerate;
 	int unitsize;
-	int num_channels;
+	int num_logic_channels;
 	int num_analog_channels;
+	int cur_analog_channel;
+	GArray *analog_channels;
 	int cur_chunk;
 	gboolean finished;
 };
@@ -64,6 +66,10 @@ 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 analog;
+	struct sr_analog_encoding encoding;
+	struct sr_analog_meaning meaning;
+	struct sr_analog_spec spec;
 	struct zip_stat zs;
 	int ret, got_data;
 	char capturefile[16];
@@ -71,10 +77,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. */
@@ -108,8 +115,26 @@ static gboolean stream_session_data(struct sr_dev_inst *sdi)
 						capturefile, 0)))
 					return FALSE;
 				sr_dbg("Opened %s.", capturefile);
+			} else if (vdev->cur_analog_channel < vdev->num_analog_channels) {
+				vdev->capturefile = g_strdup_printf("analog-1-%d",
+						vdev->num_logic_channels + vdev->cur_analog_channel + 1);
+				vdev->cur_analog_channel++;
+				vdev->cur_chunk = 0;
+				return TRUE;
 			} else {
 				/* We got all the chunks, finish up. */
+				g_free(vdev->capturefile);
+
+				/* If the file has logic channels, the initial value for
+				 * capturefile is set by stream_session_data() - however only
+				 * once. In order to not mess this mechanism up, we simulate
+				 * this here if needed. For purely analog files, capturefile
+				 * is not set.
+				 */
+				if (vdev->num_logic_channels)
+					vdev->capturefile = g_strdup("logic-1");
+				else
+					vdev->capturefile = NULL;
 				return FALSE;
 			}
 		}
@@ -117,18 +142,38 @@ 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;
+			packet.payload = &analog;
+			/* TODO: Use proper 'digits' value for this device (and its modes). */
+			sr_analog_init(&analog, &encoding, &meaning, &spec, 2);
+			analog.meaning->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.meaning->mq = SR_MQ_VOLTAGE;
+			analog.meaning->unit = SR_UNIT_VOLT;
+			analog.meaning->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 {
@@ -150,7 +195,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;
@@ -171,20 +215,14 @@ 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);
 
 	return G_SOURCE_REMOVE;
 }
 
 /* driver callbacks */
 
-static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
-{
-	return std_init(sr_ctx, di, LOG_PREFIX);
-}
-
 static int dev_clear(const struct sr_dev_driver *di)
 {
 	struct drv_context *drvc;
@@ -280,7 +318,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 		vdev->unitsize = g_variant_get_uint64(data);
 		break;
 	case SR_CONF_NUM_LOGIC_CHANNELS:
-		vdev->num_channels = g_variant_get_int32(data);
+		vdev->num_logic_channels = g_variant_get_int32(data);
 		break;
 	case SR_CONF_NUM_ANALOG_CHANNELS:
 		vdev->num_analog_channels = g_variant_get_int32(data);
@@ -310,15 +348,23 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 	return SR_OK;
 }
 
-static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 {
 	struct session_vdev *vdev;
 	int ret;
-
-	(void)cb_data;
+	GSList *l;
+	struct sr_channel *ch;
 
 	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;
 
@@ -331,8 +377,7 @@ 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);
+	std_session_send_df_header(sdi);
 
 	/* freewheeling source */
 	sr_session_source_add(sdi->session, -1, 0, 0, receive_data, (void *)sdi);
@@ -340,11 +385,10 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 	return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
 	struct session_vdev *vdev;
 
-	(void)cb_data;
 	vdev = sdi->priv;
 
 	vdev->finished = TRUE;
@@ -357,7 +401,7 @@ SR_PRIV struct sr_dev_driver session_driver = {
 	.name = "virtual-session",
 	.longname = "Session-emulating driver",
 	.api_version = 1,
-	.init = init,
+	.init = std_init,
 	.cleanup = dev_clear,
 	.scan = NULL,
 	.dev_list = NULL,