X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fsession.c;h=11da1378b56508c67c804d66bbb3169f429ea7ad;hb=aed4ad0beaf64062752039a13f9a95326aa1df87;hp=148da24b0e59fe788ea34e5b72606bfc1198677c;hpb=41de54ffb1d36cbf5021705403a85b171662ec96;p=libsigrok.git diff --git a/src/session.c b/src/session.c index 148da24b..11da1378 100644 --- a/src/session.c +++ b/src/session.c @@ -189,8 +189,6 @@ SR_API int sr_session_dev_add(struct sr_session *session, /* If sdi->driver is NULL, this is a virtual device. */ if (!sdi->driver) { - sr_dbg("%s: sdi->driver was NULL, this seems to be " - "a virtual device; continuing", __func__); /* Just add the device, don't run dev_open(). */ session->devs = g_slist_append(session->devs, (gpointer)sdi); sdi->session = session; @@ -436,8 +434,9 @@ static int verify_trigger(struct sr_trigger *trigger) SR_API int sr_session_start(struct sr_session *session) { struct sr_dev_inst *sdi; - GSList *l; - int ret; + struct sr_channel *ch; + GSList *l, *c; + int enabled_channels, ret; if (!session) { sr_err("%s: session was NULL", __func__); @@ -458,6 +457,21 @@ SR_API int sr_session_start(struct sr_session *session) ret = SR_OK; for (l = session->devs; l; l = l->next) { sdi = l->data; + enabled_channels = 0; + for (c = sdi->channels; c; c = c->next) { + ch = c->data; + if (ch->enabled) { + enabled_channels++; + break; + } + } + if (enabled_channels == 0) { + ret = SR_ERR; + sr_err("%s using connection %s has no enabled channels!", + sdi->driver->name, sdi->connection_id); + break; + } + if ((ret = sr_config_commit(sdi)) != SR_OK) { sr_err("Failed to commit device settings before " "starting acquisition (%s)", sr_strerror(ret)); @@ -647,7 +661,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; @@ -662,6 +676,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); @@ -777,7 +796,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); } /** @@ -927,4 +946,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); + +} + /** @} */