BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed session_driver so that it can run more than one session.

This commit is contained in:
Joel Holdsworth 2014-02-28 19:51:57 +01:00
parent 0ab702601d
commit 8c9d4d67f8
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
session_driver.c
View File

@ -115,7 +115,6 @@ static int receive_data(int fd, int revents, void *cb_data)
sr_dbg("Opened %s.", capturefile); sr_dbg("Opened %s.", capturefile);
} else { } else {
/* We got all the chunks, finish up. */ /* We got all the chunks, finish up. */
g_free(vdev->capturefile);
vdev->finished = TRUE; vdev->finished = TRUE;
continue; continue;
} }
@ -147,7 +146,6 @@ static int receive_data(int fd, int revents, void *cb_data)
vdev->capfile = NULL; vdev->capfile = NULL;
if (vdev->cur_chunk == 0) { if (vdev->cur_chunk == 0) {
/* It was the only file. */ /* It was the only file. */
g_free(vdev->capturefile);
vdev->finished = TRUE; vdev->finished = TRUE;
} else { } else {
/* There might be more chunks, so don't fall through /* There might be more chunks, so don't fall through
@ -202,6 +200,10 @@ static int dev_open(struct sr_dev_inst *sdi)
static int dev_close(struct sr_dev_inst *sdi) 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); g_free(sdi->priv);
sdi->priv = NULL; sdi->priv = NULL;
@ -245,10 +247,12 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
sr_info("Setting samplerate to %" PRIu64 ".", vdev->samplerate); sr_info("Setting samplerate to %" PRIu64 ".", vdev->samplerate);
break; break;
case SR_CONF_SESSIONFILE: case SR_CONF_SESSIONFILE:
g_free(vdev->sessionfile);
vdev->sessionfile = g_strdup(g_variant_get_string(data, NULL)); vdev->sessionfile = g_strdup(g_variant_get_string(data, NULL));
sr_info("Setting sessionfile to '%s'.", vdev->sessionfile); sr_info("Setting sessionfile to '%s'.", vdev->sessionfile);
break; break;
case SR_CONF_CAPTUREFILE: case SR_CONF_CAPTUREFILE:
g_free(vdev->capturefile);
vdev->capturefile = g_strdup(g_variant_get_string(data, NULL)); vdev->capturefile = g_strdup(g_variant_get_string(data, NULL));
sr_info("Setting capturefile to '%s'.", vdev->capturefile); sr_info("Setting capturefile to '%s'.", vdev->capturefile);
break; break;
@ -290,6 +294,10 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
vdev = sdi->priv; vdev = sdi->priv;
vdev->bytes_read = 0;
vdev->cur_chunk = 0;
vdev->finished = FALSE;
sr_info("Opening archive %s file %s", vdev->sessionfile, sr_info("Opening archive %s file %s", vdev->sessionfile,
vdev->capturefile); vdev->capturefile);