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

diff --git a/src/session_driver.c b/src/session_driver.c
index e0dd3fcb..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,7 +44,7 @@ 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;
@@ -66,7 +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_old analog;
+	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];
@@ -114,12 +117,24 @@ 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->num_channels + vdev->cur_analog_channel + 1);
+						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;
 			}
 		}
@@ -137,15 +152,17 @@ static gboolean stream_session_data(struct sr_dev_inst *sdi)
 	if (ret > 0) {
 		got_data = TRUE;
 		if (vdev->cur_analog_channel != 0) {
-			packet.type = SR_DF_ANALOG_OLD;
+			packet.type = SR_DF_ANALOG;
 			packet.payload = &analog;
-			analog.channels = g_slist_prepend(NULL,
+			/* 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.mq = SR_MQ_VOLTAGE;
-			analog.unit = SR_UNIT_VOLT;
-			analog.mqflags = SR_MQFLAG_DC;
+			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)
@@ -199,18 +216,13 @@ static int receive_data(int fd, int revents, void *cb_data)
 		vdev->archive = NULL;
 	}
 
-	std_session_send_df_end(sdi, LOG_PREFIX);
+	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(di, sr_ctx);
-}
-
 static int dev_clear(const struct sr_dev_driver *di)
 {
 	struct drv_context *drvc;
@@ -306,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);
@@ -365,7 +377,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 		return SR_ERR;
 	}
 
-	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);
@@ -389,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,