sr_strerror(ret));
return ret;
}
- if ((ret = sdi->driver->dev_acquisition_start(sdi,
- sdi)) != SR_OK) {
+ if ((ret = sr_dev_acquisition_start(sdi)) != SR_OK) {
sr_err("Failed to start acquisition of device in "
"running session (%s)", sr_strerror(ret));
return ret;
/* Have all devices start acquisition. */
for (l = session->devs; l; l = l->next) {
- sdi = l->data;
- ret = sdi->driver->dev_acquisition_start(sdi, sdi);
+ if (!(sdi = l->data)) {
+ sr_err("Device sdi was NULL, can't start session.");
+ ret = SR_ERR;
+ break;
+ }
+ ret = sr_dev_acquisition_start(sdi);
if (ret != SR_OK) {
sr_err("Could not start %s device %s acquisition.",
sdi->driver->name, sdi->connection_id);
lend = l->next;
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);
+ sr_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);
+ sr_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;
/* Please use the same order as in libsigrok.h. */
sr_dbg("bus: Received SR_DF_LOGIC packet (%" PRIu64 " bytes, "
"unitsize = %d).", logic->length, logic->unitsize);
break;
- 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.");
break;
}
}
+/**
+ * Helper to send a meta datafeed package (SR_DF_META) to the session bus.
+ *
+ * @param sdi The device instance to send the package from. Must not be NULL.
+ * @param key The config key to send to the session bus.
+ * @param var The value to send to the session bus.
+ *
+ * @retval SR_OK Success.
+ * @retval SR_ERR_ARG Invalid argument.
+ *
+ * @private
+ */
+SR_PRIV int sr_session_send_meta(const struct sr_dev_inst *sdi,
+ uint32_t key, GVariant *var)
+{
+ struct sr_config *cfg;
+ struct sr_datafeed_packet packet;
+ struct sr_datafeed_meta meta;
+ int ret;
+
+ cfg = sr_config_new(key, var);
+
+ memset(&meta, 0, sizeof(meta));
+
+ packet.type = SR_DF_META;
+ packet.payload = &meta;
+
+ meta.config = g_slist_append(NULL, cfg);
+
+ ret = sr_session_send(sdi, &packet);
+ g_slist_free(meta.config);
+ sr_config_free(cfg);
+
+ return ret;
+}
+
/**
* Send a packet to whatever is listening on the datafeed bus.
*
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
return SR_OK;
}
+/** @private */
SR_PRIV int sr_session_fd_source_add(struct sr_session *session,
void *key, gintptr fd, int events, int timeout,
sr_receive_data_callback cb, void *cb_data)
/* We should be using g_io_create_watch(), but can't without
* changing the driver API, as the callback signature is different.
*/
-#ifdef G_OS_WIN32
+#ifdef _WIN32
g_io_channel_win32_make_pollfd(channel, events, &pollfd);
#else
pollfd.fd = g_io_channel_unix_get_fd(channel);
g_memdup(src, sizeof(struct sr_config)));
}
-SR_PRIV int sr_packet_copy(const struct sr_datafeed_packet *packet,
+SR_API 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_old *analog_old;
- struct sr_datafeed_analog_old *analog_old_copy;
const struct sr_datafeed_analog *analog;
struct sr_datafeed_analog *analog_copy;
uint8_t *payload;
break;
case SR_DF_LOGIC:
logic = packet->payload;
- logic_copy = g_malloc(sizeof(logic));
+ logic_copy = g_malloc(sizeof(*logic_copy));
+ if (!logic_copy)
+ return SR_ERR;
logic_copy->length = logic->length;
logic_copy->unitsize = logic->unitsize;
+ logic_copy->data = g_malloc(logic->length * logic->unitsize);
+ if (!logic_copy->data) {
+ g_free(logic_copy);
+ return SR_ERR;
+ }
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));
- 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 = g_malloc(sizeof(*analog_copy));
analog_copy->data = g_malloc(
analog->encoding->unitsize * analog->num_samples);
memcpy(analog_copy->data, analog->data,
return SR_OK;
}
-void sr_packet_free(struct sr_datafeed_packet *packet)
+SR_API 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_old *analog_old;
const struct sr_datafeed_analog *analog;
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_free(analog->data);
sr_err("Unknown packet type %d", packet->type);
}
g_free(packet);
-
}
/** @} */