X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fsession_driver.c;h=a5f2e36862681511518e5e9d77603f7edb129ae8;hb=54d471f4980f1b975188b5e8bdf5aa90acd3cece;hp=99d1c6cf3473e6362b3da6b2cd8b10fda48e23a6;hpb=6cdb1da6c95d006d423a6e8c9ed7d6580d85bba4;p=libsigrok.git

diff --git a/src/session_driver.c b/src/session_driver.c
index 99d1c6cf..a5f2e368 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;
@@ -117,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;
 			}
 		}
@@ -142,7 +154,8 @@ static gboolean stream_session_data(struct sr_dev_inst *sdi)
 		if (vdev->cur_analog_channel != 0) {
 			packet.type = SR_DF_ANALOG;
 			packet.payload = &analog;
-			sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
+			/* 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));
@@ -210,20 +223,6 @@ static int receive_data(int fd, int revents, void *cb_data)
 
 /* driver callbacks */
 
-static int dev_clear(const struct sr_dev_driver *di)
-{
-	struct drv_context *drvc;
-	GSList *l;
-
-	drvc = di->context;
-	for (l = drvc->instances; l; l = l->next)
-		sr_dev_inst_free(l->data);
-	g_slist_free(drvc->instances);
-	drvc->instances = NULL;
-
-	return SR_OK;
-}
-
 static int dev_open(struct sr_dev_inst *sdi)
 {
 	struct sr_dev_driver *di;
@@ -305,7 +304,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);
@@ -320,19 +319,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
 		const struct sr_channel_group *cg)
 {
-	(void)sdi;
-	(void)cg;
-
-	switch (key) {
-	case SR_CONF_DEVICE_OPTIONS:
-		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-				devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
-		break;
-	default:
-		return SR_ERR_NA;
-	}
-
-	return SR_OK;
+	return STD_CONFIG_LIST(key, data, sdi, cg, NULL, NULL, devopts);
 }
 
 static int dev_acquisition_start(const struct sr_dev_inst *sdi)
@@ -389,10 +376,10 @@ SR_PRIV struct sr_dev_driver session_driver = {
 	.longname = "Session-emulating driver",
 	.api_version = 1,
 	.init = std_init,
-	.cleanup = dev_clear,
+	.cleanup = std_cleanup,
 	.scan = NULL,
 	.dev_list = NULL,
-	.dev_clear = dev_clear,
+	.dev_clear = std_dev_clear,
 	.config_get = config_get,
 	.config_set = config_set,
 	.config_list = config_list,