X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fsession_driver.c;h=684a7e539122418695be981fcc4fa21a9692172e;hb=94927260421eb8c5548294bbe5000b04bd1f0aa7;hp=6a320aa5b3d17908dc401fa75bea5bd1ec0d3853;hpb=584560f142e1b17b9f4ef9069bd3724f2f77e750;p=libsigrok.git
diff --git a/src/session_driver.c b/src/session_driver.c
index 6a320aa5..684a7e53 100644
--- a/src/session_driver.c
+++ b/src/session_driver.c
@@ -17,24 +17,24 @@
* along with this program. If not, see .
*/
+#include
#include
#include
#include
#include
#include
#include
-#include "libsigrok.h"
+#include
#include "libsigrok-internal.h"
#define LOG_PREFIX "virtual-session"
/* size of payloads sent across the session bus */
/** @cond PRIVATE */
-#define CHUNKSIZE (512 * 1024)
+#define CHUNKSIZE (4 * 1024 * 1024)
/** @endcond */
SR_PRIV struct sr_dev_driver session_driver_info;
-static struct sr_dev_driver *di = &session_driver_info;
struct session_vdev {
char *sessionfile;
@@ -44,138 +44,191 @@ struct session_vdev {
int bytes_read;
uint64_t samplerate;
int unitsize;
- int num_channels;
+ int num_logic_channels;
+ int num_analog_channels;
+ int cur_analog_channel;
+ GArray *analog_channels;
int cur_chunk;
gboolean finished;
};
-static const uint32_t hwcaps[] = {
- SR_CONF_CAPTUREFILE,
- SR_CONF_CAPTURE_UNITSIZE,
- SR_CONF_SAMPLERATE,
+static const uint32_t devopts[] = {
+ SR_CONF_CAPTUREFILE | SR_CONF_SET,
+ SR_CONF_CAPTURE_UNITSIZE | SR_CONF_GET | SR_CONF_SET,
+ SR_CONF_NUM_LOGIC_CHANNELS | SR_CONF_SET,
+ SR_CONF_NUM_ANALOG_CHANNELS | SR_CONF_SET,
+ SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET,
+ SR_CONF_SESSIONFILE | SR_CONF_SET,
};
-static int receive_data(int fd, int revents, void *cb_data)
+static gboolean stream_session_data(struct sr_dev_inst *sdi)
{
- struct sr_dev_inst *sdi;
struct session_vdev *vdev;
struct sr_datafeed_packet packet;
struct sr_datafeed_logic logic;
+ struct sr_datafeed_analog analog;
+ struct sr_analog_encoding encoding;
+ struct sr_analog_meaning meaning;
+ struct sr_analog_spec spec;
struct zip_stat zs;
int ret, got_data;
char capturefile[16];
void *buf;
- (void)fd;
- (void)revents;
-
- sdi = cb_data;
got_data = FALSE;
vdev = sdi->priv;
- if (!vdev->finished) {
- if (!vdev->capfile) {
- /* No capture file opened yet, or finished with the last
- * chunked one. */
- if (vdev->cur_chunk == 0) {
- /* capturefile is always the unchunked base name. */
- if (zip_stat(vdev->archive, vdev->capturefile, 0, &zs) != -1) {
- /* No chunks, just a single capture file. */
- vdev->cur_chunk = 0;
- if (!(vdev->capfile = zip_fopen(vdev->archive,
- vdev->capturefile, 0)))
- return FALSE;
- sr_dbg("Opened %s.", vdev->capturefile);
- } else {
- /* Try as first chunk filename. */
- snprintf(capturefile, 15, "%s-1", vdev->capturefile);
- if (zip_stat(vdev->archive, capturefile, 0, &zs) != -1) {
- vdev->cur_chunk = 1;
- if (!(vdev->capfile = zip_fopen(vdev->archive,
- capturefile, 0)))
- return FALSE;
- sr_dbg("Opened %s.", capturefile);
- } else {
- sr_err("No capture file '%s' in " "session file '%s'.",
- vdev->capturefile, vdev->sessionfile);
- return FALSE;
- }
- }
+
+ if (!vdev->capfile) {
+ /* No capture file opened yet, or finished with the last
+ * chunked one. */
+ if (vdev->capturefile && (vdev->cur_chunk == 0)) {
+ /* capturefile is always the unchunked base name. */
+ if (zip_stat(vdev->archive, vdev->capturefile, 0, &zs) != -1) {
+ /* No chunks, just a single capture file. */
+ vdev->cur_chunk = 0;
+ if (!(vdev->capfile = zip_fopen(vdev->archive,
+ vdev->capturefile, 0)))
+ return FALSE;
+ sr_dbg("Opened %s.", vdev->capturefile);
} else {
- /* Capture data is chunked, advance to the next chunk. */
- vdev->cur_chunk++;
- snprintf(capturefile, 15, "%s-%d", vdev->capturefile,
- vdev->cur_chunk);
+ /* Try as first chunk filename. */
+ snprintf(capturefile, 15, "%s-1", vdev->capturefile);
if (zip_stat(vdev->archive, capturefile, 0, &zs) != -1) {
+ vdev->cur_chunk = 1;
if (!(vdev->capfile = zip_fopen(vdev->archive,
capturefile, 0)))
return FALSE;
sr_dbg("Opened %s.", capturefile);
} else {
- /* We got all the chunks, finish up. */
- vdev->finished = TRUE;
- return TRUE;
+ sr_err("No capture file '%s' in " "session file '%s'.",
+ vdev->capturefile, vdev->sessionfile);
+ return FALSE;
}
}
+ } else {
+ /* Capture data is chunked, advance to the next chunk. */
+ vdev->cur_chunk++;
+ snprintf(capturefile, 15, "%s-%d", vdev->capturefile,
+ vdev->cur_chunk);
+ if (zip_stat(vdev->archive, capturefile, 0, &zs) != -1) {
+ if (!(vdev->capfile = zip_fopen(vdev->archive,
+ capturefile, 0)))
+ return FALSE;
+ sr_dbg("Opened %s.", capturefile);
+ } else if (vdev->cur_analog_channel < vdev->num_analog_channels) {
+ vdev->capturefile = g_strdup_printf("analog-1-%d",
+ vdev->num_logic_channels + vdev->cur_analog_channel + 1);
+ vdev->cur_analog_channel++;
+ vdev->cur_chunk = 0;
+ return TRUE;
+ } else {
+ /* We got all the chunks, finish up. */
+ g_free(vdev->capturefile);
+
+ /* If the file has logic channels, the initial value for
+ * capturefile is set by stream_session_data() - however only
+ * once. In order to not mess this mechanism up, we simulate
+ * this here if needed. For purely analog files, capturefile
+ * is not set.
+ */
+ if (vdev->num_logic_channels)
+ vdev->capturefile = g_strdup("logic-1");
+ else
+ vdev->capturefile = NULL;
+ return FALSE;
+ }
}
+ }
- if (!(buf = g_try_malloc(CHUNKSIZE))) {
- sr_err("%s: buf malloc failed", __func__);
- return FALSE;
- }
+ buf = g_malloc(CHUNKSIZE);
+ /* unitsize is not defined for purely analog session files. */
+ if (vdev->unitsize)
ret = zip_fread(vdev->capfile, buf,
CHUNKSIZE / vdev->unitsize * vdev->unitsize);
- if (ret > 0) {
+ else
+ ret = zip_fread(vdev->capfile, buf, CHUNKSIZE);
+
+ if (ret > 0) {
+ got_data = TRUE;
+ if (vdev->cur_analog_channel != 0) {
+ packet.type = SR_DF_ANALOG;
+ packet.payload = &analog;
+ /* TODO: Use proper 'digits' value for this device (and its modes). */
+ sr_analog_init(&analog, &encoding, &meaning, &spec, 2);
+ analog.meaning->channels = g_slist_prepend(NULL,
+ g_array_index(vdev->analog_channels,
+ struct sr_channel *, vdev->cur_analog_channel - 1));
+ analog.num_samples = ret / sizeof(float);
+ analog.meaning->mq = SR_MQ_VOLTAGE;
+ analog.meaning->unit = SR_UNIT_VOLT;
+ analog.meaning->mqflags = SR_MQFLAG_DC;
+ analog.data = (float *) buf;
+ } else {
if (ret % vdev->unitsize != 0)
sr_warn("Read size %d not a multiple of the"
" unit size %d.", ret, vdev->unitsize);
- got_data = TRUE;
packet.type = SR_DF_LOGIC;
packet.payload = &logic;
logic.length = ret;
logic.unitsize = vdev->unitsize;
logic.data = buf;
- vdev->bytes_read += ret;
- sr_session_send(sdi, &packet);
- } else {
- /* done with this capture file */
- zip_fclose(vdev->capfile);
- vdev->capfile = NULL;
- if (vdev->cur_chunk == 0) {
- /* It was the only file. */
- vdev->finished = TRUE;
- } else {
- /* There might be more chunks, so don't fall through
- * to the SR_DF_END here. */
- g_free(buf);
- return TRUE;
- }
}
- g_free(buf);
- }
-
- if (!got_data) {
- packet.type = SR_DF_END;
+ vdev->bytes_read += ret;
sr_session_send(sdi, &packet);
- sr_session_source_remove(sdi->session, -1);
+ } else {
+ /* done with this capture file */
+ zip_fclose(vdev->capfile);
+ vdev->capfile = NULL;
+ if (vdev->cur_chunk != 0) {
+ /* There might be more chunks, so don't fall through
+ * to the SR_DF_END here. */
+ got_data = TRUE;
+ }
}
+ g_free(buf);
- return TRUE;
+ return got_data;
}
-/* driver callbacks */
-
-static int init(struct sr_context *sr_ctx)
+static int receive_data(int fd, int revents, void *cb_data)
{
- return std_init(sr_ctx, di, LOG_PREFIX);
+ struct sr_dev_inst *sdi;
+ struct session_vdev *vdev;
+
+ (void)fd;
+ (void)revents;
+
+ sdi = cb_data;
+ vdev = sdi->priv;
+
+ if (!vdev->finished && !stream_session_data(sdi))
+ vdev->finished = TRUE;
+ if (!vdev->finished)
+ return G_SOURCE_CONTINUE;
+
+ if (vdev->capfile) {
+ zip_fclose(vdev->capfile);
+ vdev->capfile = NULL;
+ }
+ if (vdev->archive) {
+ zip_discard(vdev->archive);
+ vdev->archive = NULL;
+ }
+
+ std_session_send_df_end(sdi);
+
+ return G_SOURCE_REMOVE;
}
-static int dev_clear(void)
+/* driver callbacks */
+
+static int dev_clear(const struct sr_dev_driver *di)
{
struct drv_context *drvc;
GSList *l;
- drvc = di->priv;
+ drvc = di->context;
for (l = drvc->instances; l; l = l->next)
sr_dev_inst_free(l->data);
g_slist_free(drvc->instances);
@@ -186,10 +239,12 @@ static int dev_clear(void)
static int dev_open(struct sr_dev_inst *sdi)
{
+ struct sr_dev_driver *di;
struct drv_context *drvc;
struct session_vdev *vdev;
- drvc = di->priv;
+ di = sdi->driver;
+ drvc = di->context;
vdev = g_malloc0(sizeof(struct session_vdev));
sdi->priv = vdev;
drvc->instances = g_slist_append(drvc->instances, sdi);
@@ -216,13 +271,17 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
(void)cg;
+ if (!sdi)
+ return SR_ERR;
+
+ vdev = sdi->priv;
+
switch (key) {
case SR_CONF_SAMPLERATE:
- if (sdi) {
- vdev = sdi->priv;
- *data = g_variant_new_uint64(vdev->samplerate);
- } else
- return SR_ERR;
+ *data = g_variant_new_uint64(vdev->samplerate);
+ break;
+ case SR_CONF_CAPTURE_UNITSIZE:
+ *data = g_variant_new_uint64(vdev->unitsize);
break;
default:
return SR_ERR_NA;
@@ -259,7 +318,10 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
vdev->unitsize = g_variant_get_uint64(data);
break;
case SR_CONF_NUM_LOGIC_CHANNELS:
- vdev->num_channels = g_variant_get_uint64(data);
+ vdev->num_logic_channels = g_variant_get_int32(data);
+ break;
+ case SR_CONF_NUM_ANALOG_CHANNELS:
+ vdev->num_analog_channels = g_variant_get_int32(data);
break;
default:
return SR_ERR_NA;
@@ -277,7 +339,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
switch (key) {
case SR_CONF_DEVICE_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
- hwcaps, ARRAY_SIZE(hwcaps), sizeof(uint32_t));
+ devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
break;
default:
return SR_ERR_NA;
@@ -286,15 +348,23 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
return SR_OK;
}
-static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi)
{
struct session_vdev *vdev;
int ret;
-
- (void)cb_data;
+ GSList *l;
+ struct sr_channel *ch;
vdev = sdi->priv;
vdev->bytes_read = 0;
+ vdev->cur_analog_channel = 0;
+ vdev->analog_channels = g_array_sized_new(FALSE, FALSE,
+ sizeof(struct sr_channel *), vdev->num_analog_channels);
+ for (l = sdi->channels; l; l = l->next) {
+ ch = l->data;
+ if (ch->type == SR_CHANNEL_ANALOG)
+ g_array_append_val(vdev->analog_channels, ch);
+ }
vdev->cur_chunk = 0;
vdev->finished = FALSE;
@@ -307,8 +377,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
return SR_ERR;
}
- /* Send header packet to the session bus. */
- std_session_send_df_header(sdi, LOG_PREFIX);
+ std_session_send_df_header(sdi);
/* freewheeling source */
sr_session_source_add(sdi->session, -1, 0, 0, receive_data, (void *)sdi);
@@ -316,12 +385,23 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
return SR_OK;
}
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
+{
+ struct session_vdev *vdev;
+
+ vdev = sdi->priv;
+
+ vdev->finished = TRUE;
+
+ return SR_OK;
+}
+
/** @private */
SR_PRIV struct sr_dev_driver session_driver = {
.name = "virtual-session",
.longname = "Session-emulating driver",
.api_version = 1,
- .init = init,
+ .init = std_init,
.cleanup = dev_clear,
.scan = NULL,
.dev_list = NULL,
@@ -332,6 +412,6 @@ SR_PRIV struct sr_dev_driver session_driver = {
.dev_open = dev_open,
.dev_close = dev_close,
.dev_acquisition_start = dev_acquisition_start,
- .dev_acquisition_stop = NULL,
- .priv = NULL,
+ .dev_acquisition_stop = dev_acquisition_stop,
+ .context = NULL,
};