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

sr: convert session load/save code to use sr_dev_inst

This commit is contained in:
Bert Vermeulen 2012-07-22 12:18:34 +02:00
parent c4a1de59f8
commit 4d68442739
2 changed files with 22 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
session_driver.c
View File

@ -47,31 +47,6 @@ static const int hwcaps[] = {
0, 0,
}; };
/**
* TODO.
*
* @param dev_index TODO.
*/
static struct session_vdev *get_vdev_by_index(int dev_index)
{
struct sr_dev_inst *sdi;
struct session_vdev *vdev;
/* TODO: Sanity checks on dev_index. */
if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
sr_err("session driver: %s: device instance with device "
"index %d was not found", __func__, dev_index);
return NULL;
}
/* TODO: Is sdi->priv == NULL valid? */
vdev = sdi->priv;
return vdev;
}
/** /**
* TODO. * TODO.
* *
@ -260,7 +235,8 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
return SR_OK; return SR_OK;
} }
static int hw_dev_acquisition_start(int dev_index, void *cb_data) static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
void *cb_data)
{ {
struct zip_stat zs; struct zip_stat zs;
struct session_vdev *vdev; struct session_vdev *vdev;
@ -269,8 +245,7 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
struct sr_datafeed_meta_logic meta; struct sr_datafeed_meta_logic meta;
int ret; int ret;
if (!(vdev = get_vdev_by_index(dev_index))) vdev = sdi->priv;
return SR_ERR;
sr_info("session_driver: opening archive %s file %s", vdev->sessionfile, sr_info("session_driver: opening archive %s file %s", vdev->sessionfile,
vdev->capturefile); vdev->capturefile);

33
session_file.c
View File

@ -46,7 +46,7 @@ SR_API int sr_session_load(const char *filename)
struct zip *archive; struct zip *archive;
struct zip_file *zf; struct zip_file *zf;
struct zip_stat zs; struct zip_stat zs;
struct sr_dev *dev; struct sr_dev_inst *sdi;
struct sr_probe *probe; struct sr_probe *probe;
int ret, probenum, devcnt, i, j; int ret, probenum, devcnt, i, j;
uint64_t tmp_u64, total_probes, enabled_probes, p; uint64_t tmp_u64, total_probes, enabled_probes, p;
@ -108,42 +108,46 @@ SR_API int sr_session_load(const char *filename)
continue; continue;
if (!strncmp(sections[i], "device ", 7)) { if (!strncmp(sections[i], "device ", 7)) {
/* device section */ /* device section */
dev = NULL; sdi = NULL;
enabled_probes = 0; enabled_probes = 0;
keys = g_key_file_get_keys(kf, sections[i], NULL, NULL); keys = g_key_file_get_keys(kf, sections[i], NULL, NULL);
for (j = 0; keys[j]; j++) { for (j = 0; keys[j]; j++) {
val = g_key_file_get_string(kf, sections[i], keys[j], NULL); val = g_key_file_get_string(kf, sections[i], keys[j], NULL);
if (!strcmp(keys[j], "capturefile")) { if (!strcmp(keys[j], "capturefile")) {
dev = sr_dev_new(&session_driver, devcnt); sdi = sr_dev_inst_new(devcnt, SR_ST_ACTIVE, NULL, NULL, NULL);
sdi->driver = &session_driver;
if (devcnt == 0) if (devcnt == 0)
/* first device, init the driver */ /* first device, init the driver */
dev->driver->init(); sdi->driver->init();
sr_session_dev_add(dev); sr_session_dev_add(sdi);
dev->driver->dev_config_set(devcnt, SR_HWCAP_SESSIONFILE, filename); sdi->driver->dev_config_set(sdi, SR_HWCAP_SESSIONFILE, filename);
dev->driver->dev_config_set(devcnt, SR_HWCAP_CAPTUREFILE, val); sdi->driver->dev_config_set(sdi, SR_HWCAP_CAPTUREFILE, val);
g_ptr_array_add(capturefiles, val); g_ptr_array_add(capturefiles, val);
} else if (!strcmp(keys[j], "samplerate")) { } else if (!strcmp(keys[j], "samplerate")) {
sr_parse_sizestring(val, &tmp_u64); sr_parse_sizestring(val, &tmp_u64);
dev->driver->dev_config_set(devcnt, SR_HWCAP_SAMPLERATE, &tmp_u64); sdi->driver->dev_config_set(sdi, SR_HWCAP_SAMPLERATE, &tmp_u64);
} else if (!strcmp(keys[j], "unitsize")) { } else if (!strcmp(keys[j], "unitsize")) {
tmp_u64 = strtoull(val, NULL, 10); tmp_u64 = strtoull(val, NULL, 10);
dev->driver->dev_config_set(devcnt, SR_HWCAP_CAPTURE_UNITSIZE, &tmp_u64); sdi->driver->dev_config_set(sdi, SR_HWCAP_CAPTURE_UNITSIZE, &tmp_u64);
} else if (!strcmp(keys[j], "total probes")) { } else if (!strcmp(keys[j], "total probes")) {
total_probes = strtoull(val, NULL, 10); total_probes = strtoull(val, NULL, 10);
dev->driver->dev_config_set(devcnt, SR_HWCAP_CAPTURE_NUM_PROBES, &total_probes); sdi->driver->dev_config_set(sdi, SR_HWCAP_CAPTURE_NUM_PROBES, &total_probes);
for (p = 0; p < total_probes; p++) { for (p = 0; p < total_probes; p++) {
snprintf(probename, SR_MAX_PROBENAME_LEN, "%" PRIu64, p); snprintf(probename, SR_MAX_PROBENAME_LEN, "%" PRIu64, p);
sr_dev_probe_add(dev, probename); if (!(probe = sr_probe_new(j, SR_PROBE_LOGIC, TRUE,
probename)))
return SR_ERR;
sdi->probes = g_slist_append(sdi->probes, probe);
} }
} else if (!strncmp(keys[j], "probe", 5)) { } else if (!strncmp(keys[j], "probe", 5)) {
if (!dev) if (!sdi)
continue; continue;
enabled_probes++; enabled_probes++;
tmp_u64 = strtoul(keys[j]+5, NULL, 10); tmp_u64 = strtoul(keys[j]+5, NULL, 10);
sr_dev_probe_name_set(dev, tmp_u64, val); sr_dev_probe_name_set(dev, tmp_u64, val);
} else if (!strncmp(keys[j], "trigger", 7)) { } else if (!strncmp(keys[j], "trigger", 7)) {
probenum = strtoul(keys[j]+7, NULL, 10); probenum = strtoul(keys[j]+7, NULL, 10);
sr_dev_trigger_set(dev, probenum, val); sr_dev_trigger_set(sdi, probenum, val);
} }
} }
g_strfreev(keys); g_strfreev(keys);
@ -152,6 +156,7 @@ SR_API int sr_session_load(const char *filename)
probe->enabled = FALSE; probe->enabled = FALSE;
} }
} }
devcnt++;
} }
g_strfreev(sections); g_strfreev(sections);
g_key_file_free(kf); g_key_file_free(kf);
@ -172,7 +177,7 @@ int sr_session_save(const char *filename)
{ {
GSList *l, *p, *d; GSList *l, *p, *d;
FILE *meta; FILE *meta;
struct sr_dev *dev; struct sr_dev_inst *sdi;
struct sr_probe *probe; struct sr_probe *probe;
struct sr_datastore *ds; struct sr_datastore *ds;
struct zip *zipfile; struct zip *zipfile;