int bytes_read;
uint64_t samplerate;
int unitsize;
- int num_probes;
+ int num_channels;
int cur_chunk;
gboolean finished;
};
sr_dbg("Opened %s.", capturefile);
} else {
/* We got all the chunks, finish up. */
- g_free(vdev->capturefile);
vdev->finished = TRUE;
continue;
}
return FALSE;
}
- ret = zip_fread(vdev->capfile, buf, CHUNKSIZE);
+ ret = zip_fread(vdev->capfile, buf,
+ CHUNKSIZE / vdev->unitsize * vdev->unitsize);
if (ret > 0) {
+ 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;
vdev->capfile = NULL;
if (vdev->cur_chunk == 0) {
/* It was the only file. */
- g_free(vdev->capturefile);
vdev->finished = TRUE;
} else {
/* There might be more chunks, so don't fall through
return SR_OK;
}
-static int cleanup(void)
+static int dev_clear(void)
{
GSList *l;
static int dev_close(struct sr_dev_inst *sdi)
{
+ const struct session_vdev *const vdev = sdi->priv;
+ g_free(vdev->sessionfile);
+ g_free(vdev->capturefile);
+
g_free(sdi->priv);
sdi->priv = NULL;
}
static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
- const struct sr_probe_group *probe_group)
+ const struct sr_channel_group *cg)
{
struct session_vdev *vdev;
- (void)probe_group;
+ (void)cg;
switch (id) {
case SR_CONF_SAMPLERATE:
}
static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
- const struct sr_probe_group *probe_group)
+ const struct sr_channel_group *cg)
{
struct session_vdev *vdev;
- (void)probe_group;
+ (void)cg;
vdev = sdi->priv;
sr_info("Setting samplerate to %" PRIu64 ".", vdev->samplerate);
break;
case SR_CONF_SESSIONFILE:
+ g_free(vdev->sessionfile);
vdev->sessionfile = g_strdup(g_variant_get_string(data, NULL));
sr_info("Setting sessionfile to '%s'.", vdev->sessionfile);
break;
case SR_CONF_CAPTUREFILE:
+ g_free(vdev->capturefile);
vdev->capturefile = g_strdup(g_variant_get_string(data, NULL));
sr_info("Setting capturefile to '%s'.", vdev->capturefile);
break;
case SR_CONF_CAPTURE_UNITSIZE:
vdev->unitsize = g_variant_get_uint64(data);
break;
- case SR_CONF_NUM_LOGIC_PROBES:
- vdev->num_probes = g_variant_get_uint64(data);
+ case SR_CONF_NUM_LOGIC_CHANNELS:
+ vdev->num_channels = g_variant_get_uint64(data);
break;
default:
return SR_ERR_NA;
}
static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
- const struct sr_probe_group *probe_group)
+ const struct sr_channel_group *cg)
{
(void)sdi;
- (void)probe_group;
+ (void)cg;
switch (key) {
case SR_CONF_DEVICE_OPTIONS:
vdev = sdi->priv;
+ vdev->bytes_read = 0;
+ vdev->cur_chunk = 0;
+ vdev->finished = FALSE;
+
sr_info("Opening archive %s file %s", vdev->sessionfile,
vdev->capturefile);
.longname = "Session-emulating driver",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = dev_clear,
.scan = NULL,
.dev_list = NULL,
- .dev_clear = NULL,
+ .dev_clear = dev_clear,
.config_get = config_get,
.config_set = config_set,
.config_list = config_list,