GSourceFunc callback, void *user_data)
{
struct fd_source *fsource;
- const char *name;
unsigned int revents;
gboolean keep;
fsource = (struct fd_source *)source;
- name = g_source_get_name(source);
revents = fsource->pollfd.revents;
- if (revents != 0) {
- sr_spew("%s: %s " G_POLLFD_FORMAT ", revents 0x%.2X",
- __func__, name, fsource->pollfd.fd, revents);
- } else {
- sr_spew("%s: %s " G_POLLFD_FORMAT ", timed out",
- __func__, name, fsource->pollfd.fd);
- }
if (!callback) {
sr_err("Callback not set, cannot dispatch event.");
return G_SOURCE_REMOVE;
sr_session_dev_remove_all(session);
g_slist_free_full(session->owned_devs, (GDestroyNotify)sr_dev_inst_free);
+ sr_session_datafeed_callback_remove_all(session);
+
g_hash_table_unref(session->event_sources);
g_mutex_clear(&session->main_mutex);
sr_strerror(ret));
return ret;
}
- if ((ret = sdi->driver->dev_acquisition_start(sdi,
- sdi)) != SR_OK) {
+ if ((ret = sdi->driver->dev_acquisition_start(sdi)) != SR_OK) {
sr_err("Failed to start acquisition of device in "
"running session (%s)", sr_strerror(ret));
return ret;
return SR_OK;
}
+/**
+ * Remove a device instance from a session.
+ *
+ * @param session The session to remove from. Must not be NULL.
+ * @param sdi The device instance to remove from a session. Must not
+ * be NULL. Also, sdi->driver and sdi->driver->dev_open must
+ * not be NULL.
+ *
+ * @retval SR_OK Success.
+ * @retval SR_ERR_ARG Invalid argument.
+ *
+ * @since 0.4.0
+ */
+SR_API int sr_session_dev_remove(struct sr_session *session,
+ struct sr_dev_inst *sdi)
+{
+ if (!sdi) {
+ sr_err("%s: sdi was NULL", __func__);
+ return SR_ERR_ARG;
+ }
+
+ if (!session) {
+ sr_err("%s: session was NULL", __func__);
+ return SR_ERR_ARG;
+ }
+
+ /* If sdi->session is not session, the device is not in this
+ * session. */
+ if (sdi->session != session) {
+ sr_err("%s: not assigned to this session", __func__);
+ return SR_ERR_ARG;
+ }
+
+ session->devs = g_slist_remove(session->devs, sdi);
+ sdi->session = NULL;
+
+ return SR_OK;
+}
+
/**
* Remove all datafeed callbacks in a session.
*
/* Have all devices start acquisition. */
for (l = session->devs; l; l = l->next) {
sdi = l->data;
- ret = sdi->driver->dev_acquisition_start(sdi, sdi);
+ ret = sdi->driver->dev_acquisition_start(sdi);
if (ret != SR_OK) {
sr_err("Could not start %s device %s acquisition.",
sdi->driver->name, sdi->connection_id);
for (l = session->devs; l != lend; l = l->next) {
sdi = l->data;
if (sdi->driver->dev_acquisition_stop)
- sdi->driver->dev_acquisition_stop(sdi, sdi);
+ sdi->driver->dev_acquisition_stop(sdi);
}
/* TODO: Handle delayed stops. Need to iterate the event
* sources... */
for (node = session->devs; node; node = node->next) {
sdi = node->data;
if (sdi->driver && sdi->driver->dev_acquisition_stop)
- sdi->driver->dev_acquisition_stop(sdi, sdi);
+ sdi->driver->dev_acquisition_stop(sdi);
}
return G_SOURCE_REMOVE;
static void datafeed_dump(const struct sr_datafeed_packet *packet)
{
const struct sr_datafeed_logic *logic;
+ const struct sr_datafeed_analog_old *analog_old;
const struct sr_datafeed_analog *analog;
- const struct sr_datafeed_analog2 *analog2;
/* Please use the same order as in libsigrok.h. */
switch (packet->type) {
sr_dbg("bus: Received SR_DF_LOGIC packet (%" PRIu64 " bytes, "
"unitsize = %d).", logic->length, logic->unitsize);
break;
- case SR_DF_ANALOG:
- analog = packet->payload;
- sr_dbg("bus: Received SR_DF_ANALOG packet (%d samples).",
- analog->num_samples);
+ case SR_DF_ANALOG_OLD:
+ analog_old = packet->payload;
+ sr_dbg("bus: Received SR_DF_ANALOG_OLD packet (%d samples).",
+ analog_old->num_samples);
break;
case SR_DF_FRAME_BEGIN:
sr_dbg("bus: Received SR_DF_FRAME_BEGIN packet.");
case SR_DF_FRAME_END:
sr_dbg("bus: Received SR_DF_FRAME_END packet.");
break;
- case SR_DF_ANALOG2:
- analog2 = packet->payload;
- sr_dbg("bus: Received SR_DF_ANALOG2 packet (%d samples).",
- analog2->num_samples);
+ case SR_DF_ANALOG:
+ analog = packet->payload;
+ sr_dbg("bus: Received SR_DF_ANALOG packet (%d samples).",
+ analog->num_samples);
break;
default:
sr_dbg("bus: Received unknown packet type: %d.", packet->type);
return SR_ERR_BUG;
}
+ if (packet->type == SR_DF_ANALOG_OLD) {
+ /* Convert to SR_DF_ANALOG. */
+ const struct sr_datafeed_analog_old *analog_old = packet->payload;
+ struct sr_analog_encoding encoding;
+ struct sr_analog_meaning meaning;
+ struct sr_analog_spec spec;
+ struct sr_datafeed_analog analog;
+ struct sr_datafeed_packet new_packet;
+ new_packet.type = SR_DF_ANALOG;
+ new_packet.payload = &analog;
+ analog.data = analog_old->data;
+ analog.num_samples = analog_old->num_samples;
+ analog.encoding = &encoding;
+ analog.meaning = &meaning;
+ analog.spec = &spec;
+ encoding.unitsize = sizeof(float);
+ encoding.is_signed = TRUE;
+ encoding.is_float = TRUE;
+#ifdef WORDS_BIGENDIAN
+ encoding.is_bigendian = TRUE;
+#else
+ encoding.is_bigendian = FALSE;
+#endif
+ encoding.digits = 0;
+ encoding.is_digits_decimal = FALSE;
+ encoding.scale.p = 1;
+ encoding.scale.q = 1;
+ encoding.offset.p = 0;
+ encoding.offset.q = 1;
+ meaning.mq = analog_old->mq;
+ meaning.unit = analog_old->unit;
+ meaning.mqflags = analog_old->mqflags;
+ meaning.channels = analog_old->channels;
+ spec.spec_digits = 0;
+ return sr_session_send(sdi, &new_packet);
+ }
+
/*
* Pass the packet to the first transform module. If that returns
* another packet (instead of NULL), pass that packet to the next
struct sr_datafeed_meta *meta_copy;
const struct sr_datafeed_logic *logic;
struct sr_datafeed_logic *logic_copy;
+ const struct sr_datafeed_analog_old *analog_old;
+ struct sr_datafeed_analog_old *analog_old_copy;
const struct sr_datafeed_analog *analog;
struct sr_datafeed_analog *analog_copy;
- const struct sr_datafeed_analog2 *analog2;
- struct sr_datafeed_analog2 *analog2_copy;
uint8_t *payload;
*copy = g_malloc0(sizeof(struct sr_datafeed_packet));
break;
case SR_DF_LOGIC:
logic = packet->payload;
- logic_copy = g_malloc(sizeof(logic));
+ logic_copy = g_malloc(sizeof(*logic_copy));
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_OLD:
+ analog_old = packet->payload;
+ analog_old_copy = g_malloc(sizeof(*analog_old_copy));
+ analog_old_copy->channels = g_slist_copy(analog_old->channels);
+ analog_old_copy->num_samples = analog_old->num_samples;
+ analog_old_copy->mq = analog_old->mq;
+ analog_old_copy->unit = analog_old->unit;
+ analog_old_copy->mqflags = analog_old->mqflags;
+ analog_old_copy->data = g_malloc(analog_old->num_samples * sizeof(float));
+ memcpy(analog_old_copy->data, analog_old->data,
+ analog_old->num_samples * sizeof(float));
+ (*copy)->payload = analog_old_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;
- analog_copy->data = g_malloc(analog->num_samples * sizeof(float));
+ analog_copy = g_malloc(sizeof(*analog_copy));
+ analog_copy->data = g_malloc(
+ analog->encoding->unitsize * analog->num_samples);
memcpy(analog_copy->data, analog->data,
- analog->num_samples * sizeof(float));
- (*copy)->payload = analog_copy;
- break;
- case SR_DF_ANALOG2:
- analog2 = packet->payload;
- analog2_copy = g_malloc(sizeof(analog2));
- analog2_copy->data = g_malloc(
- analog2->encoding->unitsize * analog2->num_samples);
- memcpy(analog2_copy->data, analog2->data,
- analog2->encoding->unitsize * analog2->num_samples);
- analog2_copy->num_samples = analog2->num_samples;
- analog2_copy->encoding = g_memdup(analog2->encoding,
+ analog->encoding->unitsize * analog->num_samples);
+ analog_copy->num_samples = analog->num_samples;
+ analog_copy->encoding = g_memdup(analog->encoding,
sizeof(struct sr_analog_encoding));
- analog2_copy->meaning = g_memdup(analog2->meaning,
+ analog_copy->meaning = g_memdup(analog->meaning,
sizeof(struct sr_analog_meaning));
- analog2_copy->meaning->channels = g_slist_copy(
- analog2->meaning->channels);
- analog2_copy->spec = g_memdup(analog2->spec,
+ analog_copy->meaning->channels = g_slist_copy(
+ analog->meaning->channels);
+ analog_copy->spec = g_memdup(analog->spec,
sizeof(struct sr_analog_spec));
- (*copy)->payload = analog2_copy;
+ (*copy)->payload = analog_copy;
break;
default:
sr_err("Unknown packet type %d", packet->type);
{
const struct sr_datafeed_meta *meta;
const struct sr_datafeed_logic *logic;
+ const struct sr_datafeed_analog_old *analog_old;
const struct sr_datafeed_analog *analog;
- const struct sr_datafeed_analog2 *analog2;
struct sr_config *src;
GSList *l;
g_free(logic->data);
g_free((void *)packet->payload);
break;
+ case SR_DF_ANALOG_OLD:
+ analog_old = packet->payload;
+ g_slist_free(analog_old->channels);
+ g_free(analog_old->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;
- case SR_DF_ANALOG2:
- analog2 = packet->payload;
- g_free(analog2->data);
- g_free(analog2->encoding);
- g_slist_free(analog2->meaning->channels);
- g_free(analog2->meaning);
- g_free(analog2->spec);
+ g_free(analog->encoding);
+ g_slist_free(analog->meaning->channels);
+ g_free(analog->meaning);
+ g_free(analog->spec);
g_free((void *)packet->payload);
break;
default:
projects / libsigrok.git / blobdiff