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

Properly publish samplerate when loading session file.

This commit is contained in:
Bert Vermeulen 2014-01-25 12:44:00 +01:00
parent 3a84104080
commit aa48adf960
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
session_driver.c
View File

@ -43,13 +43,14 @@ struct session_vdev {
int unitsize; int unitsize;
int num_probes; int num_probes;
int cur_chunk; int cur_chunk;
gboolean finished;
}; };
static GSList *dev_insts = NULL; static GSList *dev_insts = NULL;
static const int hwcaps[] = { static const int hwcaps[] = {
SR_CONF_CAPTUREFILE, SR_CONF_CAPTUREFILE,
SR_CONF_CAPTURE_UNITSIZE, SR_CONF_CAPTURE_UNITSIZE,
0, SR_CONF_SAMPLERATE,
}; };
static int receive_data(int fd, int revents, void *cb_data) static int receive_data(int fd, int revents, void *cb_data)
@ -70,7 +71,8 @@ static int receive_data(int fd, int revents, void *cb_data)
got_data = FALSE; got_data = FALSE;
for (l = dev_insts; l; l = l->next) { for (l = dev_insts; l; l = l->next) {
sdi = l->data; sdi = l->data;
if (!(vdev = sdi->priv)) vdev = sdi->priv;
if (vdev->finished)
/* Already done with this instance. */ /* Already done with this instance. */
continue; continue;
@ -114,8 +116,7 @@ static int receive_data(int fd, int revents, void *cb_data)
} else { } else {
/* We got all the chunks, finish up. */ /* We got all the chunks, finish up. */
g_free(vdev->capturefile); g_free(vdev->capturefile);
g_free(vdev); vdev->finished = TRUE;
sdi->priv = NULL;
continue; continue;
} }
} }
@ -143,8 +144,7 @@ static int receive_data(int fd, int revents, void *cb_data)
if (vdev->cur_chunk == 0) { if (vdev->cur_chunk == 0) {
/* It was the only file. */ /* It was the only file. */
g_free(vdev->capturefile); g_free(vdev->capturefile);
g_free(vdev); vdev->finished = TRUE;
sdi->priv = NULL;
} else { } else {
/* There might be more chunks, so don't fall through /* There might be more chunks, so don't fall through
* to the SR_DF_END here. */ * to the SR_DF_END here. */
@ -187,12 +187,19 @@ static int cleanup(void)
static int dev_open(struct sr_dev_inst *sdi) static int dev_open(struct sr_dev_inst *sdi)
{ {
if (!(sdi->priv = g_try_malloc0(sizeof(struct session_vdev)))) { struct session_vdev *vdev;
sr_err("Device context malloc failed.");
return SR_ERR_MALLOC; vdev = g_try_malloc0(sizeof(struct session_vdev));
sdi->priv = vdev;
dev_insts = g_slist_append(dev_insts, sdi);
return SR_OK;
} }
dev_insts = g_slist_append(dev_insts, sdi); static int dev_close(struct sr_dev_inst *sdi)
{
g_free(sdi->priv);
sdi->priv = NULL;
return SR_OK; return SR_OK;
} }
@ -311,7 +318,7 @@ SR_PRIV struct sr_dev_driver session_driver = {
.config_set = config_set, .config_set = config_set,
.config_list = config_list, .config_list = config_list,
.dev_open = dev_open, .dev_open = dev_open,
.dev_close = NULL, .dev_close = dev_close,
.dev_acquisition_start = dev_acquisition_start, .dev_acquisition_start = dev_acquisition_start,
.dev_acquisition_stop = NULL, .dev_acquisition_stop = NULL,
.priv = NULL, .priv = NULL,