X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fsession.c;h=16bd2ab3c4ec5e6f9bf471bdb8d52038a691c41c;hb=023c73ae0550ac529b93cb6a5fc9f390448f42e1;hp=dc8fd4fbeaffc2ce3c78cdeabcd5156f30c44363;hpb=013ec84b83a64088b524bb0b3a923c98b7ae9ea4;p=libsigrok.git

diff --git a/src/session.c b/src/session.c
index dc8fd4fb..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;
@@ -661,7 +669,7 @@ static void datafeed_dump(const struct sr_datafeed_packet *packet)
  * @private
  */
 SR_PRIV int sr_session_send(const struct sr_dev_inst *sdi,
-			    const struct sr_datafeed_packet *packet)
+		const struct sr_datafeed_packet *packet)
 {
 	GSList *l;
 	struct datafeed_callback *cb_struct;
@@ -676,6 +684,11 @@ SR_PRIV int sr_session_send(const struct sr_dev_inst *sdi,
 		return SR_ERR_ARG;
 	}
 
+	if (!sdi->session) {
+		sr_err("%s: session was NULL", __func__);
+		return SR_ERR_BUG;
+	}
+
 	for (l = sdi->session->datafeed_callbacks; l; l = l->next) {
 		if (sr_log_loglevel_get() >= SR_LOG_DBG)
 			datafeed_dump(packet);
@@ -791,7 +804,7 @@ SR_API int sr_session_source_add_pollfd(struct sr_session *session,
 		void *cb_data)
 {
 	return _sr_session_source_add(session, pollfd, timeout, cb,
-				      cb_data, (gintptr)pollfd);
+			cb_data, (gintptr)pollfd);
 }
 
 /**
@@ -941,4 +954,119 @@ SR_API int sr_session_source_remove_channel(struct sr_session *session,
 	return _sr_session_source_remove(session, (gintptr)channel);
 }
 
+static void *copy_src(struct sr_config *src)
+{
+	struct sr_config *new_src;
+
+	new_src = g_malloc(sizeof(struct sr_config));
+	memcpy(new_src, src, sizeof(struct sr_config));
+	g_variant_ref(src->data);
+
+	return new_src;
+}
+
+SR_PRIV int sr_packet_copy(const struct sr_datafeed_packet *packet,
+		struct sr_datafeed_packet **copy)
+{
+	const struct sr_datafeed_meta *meta;
+	struct sr_datafeed_meta *meta_copy;
+	const struct sr_datafeed_logic *logic;
+	struct sr_datafeed_logic *logic_copy;
+	const struct sr_datafeed_analog *analog;
+	struct sr_datafeed_analog *analog_copy;
+	uint8_t *payload;
+
+	*copy = g_malloc0(sizeof(struct sr_datafeed_packet));
+	(*copy)->type = packet->type;
+
+	switch (packet->type) {
+	case SR_DF_TRIGGER:
+	case SR_DF_END:
+		/* No payload. */
+		break;
+	case SR_DF_HEADER:
+		payload = g_malloc(sizeof(struct sr_datafeed_header));
+		memcpy(payload, packet->payload, sizeof(struct sr_datafeed_header));
+		(*copy)->payload = payload;
+		break;
+	case SR_DF_META:
+		meta = packet->payload;
+		meta_copy = g_malloc(sizeof(struct sr_datafeed_meta));
+		meta_copy->config = g_slist_copy_deep(meta->config,
+				(GCopyFunc)copy_src, NULL);
+		(*copy)->payload = meta_copy;
+		break;
+	case SR_DF_LOGIC:
+		logic = packet->payload;
+		logic_copy = g_malloc(sizeof(logic));
+		logic_copy->length = logic->length;
+		logic_copy->unitsize = logic->unitsize;
+		memcpy(logic_copy->data, logic->data, logic->length * logic->unitsize);
+		(*copy)->payload = logic_copy;
+		break;
+	case SR_DF_ANALOG:
+		analog = packet->payload;
+		analog_copy = g_malloc(sizeof(analog));
+		analog_copy->channels = g_slist_copy(analog->channels);
+		analog_copy->num_samples = analog->num_samples;
+		analog_copy->mq = analog->mq;
+		analog_copy->unit = analog->unit;
+		analog_copy->mqflags = analog->mqflags;
+		memcpy(analog_copy->data, analog->data,
+				analog->num_samples * sizeof(float));
+		(*copy)->payload = analog_copy;
+		break;
+	default:
+		sr_err("Unknown packet type %d", packet->type);
+		return SR_ERR;
+	}
+
+	return SR_OK;
+}
+
+void sr_packet_free(struct sr_datafeed_packet *packet)
+{
+	const struct sr_datafeed_meta *meta;
+	const struct sr_datafeed_logic *logic;
+	const struct sr_datafeed_analog *analog;
+	struct sr_config *src;
+	GSList *l;
+
+	switch (packet->type) {
+	case SR_DF_TRIGGER:
+	case SR_DF_END:
+		/* No payload. */
+		break;
+	case SR_DF_HEADER:
+		/* Payload is a simple struct. */
+		g_free((void *)packet->payload);
+		break;
+	case SR_DF_META:
+		meta = packet->payload;
+		for (l = meta->config; l; l = l->next) {
+			src = l->data;
+			g_variant_unref(src->data);
+			g_free(src);
+		}
+		g_slist_free(meta->config);
+		g_free((void *)packet->payload);
+		break;
+	case SR_DF_LOGIC:
+		logic = packet->payload;
+		g_free(logic->data);
+		g_free((void *)packet->payload);
+		break;
+	case SR_DF_ANALOG:
+		analog = packet->payload;
+		g_slist_free(analog->channels);
+		g_free(analog->data);
+		g_free((void *)packet->payload);
+		break;
+	default:
+		sr_err("Unknown packet type %d", packet->type);
+	}
+	g_free(packet);
+
+}
+
 /** @} */