got_data = FALSE;
vdev = sdi->priv;
+
if (!vdev->capfile) {
/* No capture file opened yet, or finished with the last
* chunked one. */
- if (vdev->cur_chunk == 0) {
+ 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. */
buf = g_malloc(CHUNKSIZE);
- ret = zip_fread(vdev->capfile, buf,
- CHUNKSIZE / vdev->unitsize * vdev->unitsize);
+ /* unitsize is not defined for purely analog session files. */
+ if (vdev->unitsize)
+ ret = zip_fread(vdev->capfile, buf,
+ CHUNKSIZE / vdev->unitsize * vdev->unitsize);
+ else
+ ret = zip_fread(vdev->capfile, buf, CHUNKSIZE);
+
if (ret > 0) {
got_data = TRUE;
if (vdev->cur_analog_channel != 0) {
{
struct sr_dev_inst *sdi;
struct session_vdev *vdev;
- struct sr_datafeed_packet packet;
(void)fd;
(void)revents;
zip_discard(vdev->archive);
vdev->archive = NULL;
}
- packet.type = SR_DF_END;
- packet.payload = NULL;
- sr_session_send(sdi, &packet);
+
+ std_session_send_df_end(sdi);
return G_SOURCE_REMOVE;
}
/* driver callbacks */
-static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
-{
- return std_init(sr_ctx, di, LOG_PREFIX);
-}
-
static int dev_clear(const struct sr_dev_driver *di)
{
struct drv_context *drvc;
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;
GSList *l;
struct sr_channel *ch;
- (void)cb_data;
-
vdev = sdi->priv;
vdev->bytes_read = 0;
vdev->cur_analog_channel = 0;
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);
return SR_OK;
}
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
{
struct session_vdev *vdev;
- (void)cb_data;
vdev = sdi->priv;
vdev->finished = TRUE;
.name = "virtual-session",
.longname = "Session-emulating driver",
.api_version = 1,
- .init = init,
+ .init = std_init,
.cleanup = dev_clear,
.scan = NULL,
.dev_list = NULL,