X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fsession.c;h=16bd2ab3c4ec5e6f9bf471bdb8d52038a691c41c;hb=cf0280fa1ba3532e1d3aa15b86323c9de7d5365c;hp=f2c5edc40ed14c35db0ba4f1cc625c9dca20518c;hpb=8143cfdc90fc164e083a19c60b5b5d32a6b34f47;p=libsigrok.git

diff --git a/src/session.c b/src/session.c
index f2c5edc4..16bd2ab3 100644
--- a/src/session.c
+++ b/src/session.c
@@ -113,6 +113,8 @@ SR_API int sr_session_destroy(struct sr_session *session)
 	if (session->trigger)
 		sr_trigger_free(session->trigger);
 
+	g_slist_free_full(session->owned_devs, (GDestroyNotify)sr_dev_inst_free);
+
 	g_free(session);
 
 	return SR_OK;
@@ -467,8 +469,8 @@ SR_API int sr_session_start(struct sr_session *session)
 		}
 		if (enabled_channels == 0) {
 			ret = SR_ERR;
-			sr_err("%s instance %d has no enabled channels!",
-					sdi->driver->name, sdi->index);
+			sr_err("%s using connection %s has no enabled channels!",
+					sdi->driver->name, sdi->connection_id);
 			break;
 		}
 
@@ -611,6 +613,7 @@ static void datafeed_dump(const struct sr_datafeed_packet *packet)
 {
 	const struct sr_datafeed_logic *logic;
 	const struct sr_datafeed_analog *analog;
+	const struct sr_datafeed_analog2 *analog2;
 
 	switch (packet->type) {
 	case SR_DF_HEADER:
@@ -632,6 +635,11 @@ static void datafeed_dump(const struct sr_datafeed_packet *packet)
 		sr_dbg("bus: Received SR_DF_ANALOG packet (%d samples).",
 		       analog->num_samples);
 		break;
+	case SR_DF_ANALOG2:
+		analog2 = packet->payload;
+		sr_dbg("bus: Received SR_DF_ANALOG2 packet (%d samples).",
+		       analog2->num_samples);
+		break;
 	case SR_DF_END:
 		sr_dbg("bus: Received SR_DF_END packet.");
 		break;