#include <glib.h>
#include <glib/gstdio.h>
#include "config.h"
-#include "sigrok.h"
-#include "sigrok-internal.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
extern struct sr_session *session;
-extern SR_PRIV struct sr_dev_plugin session_driver;
+extern SR_PRIV struct sr_dev_driver session_driver;
/**
* Load the session from the specified filename.
struct zip *archive;
struct zip_file *zf;
struct zip_stat zs;
- struct sr_session *session;
- struct sr_dev *dev;
+ struct sr_dev_inst *sdi;
struct sr_probe *probe;
- int ret, err, probenum, devcnt, i, j;
+ int ret, probenum, devcnt, i, j;
uint64_t tmp_u64, total_probes, enabled_probes, p;
char **sections, **keys, *metafile, *val, c;
char probename[SR_MAX_PROBENAME_LEN + 1];
return SR_ERR_ARG;
}
- if (!(archive = zip_open(filename, 0, &err))) {
+ if (!(archive = zip_open(filename, 0, &ret))) {
sr_dbg("session file: Failed to open session file: zip "
- "error %d", err);
+ "error %d", ret);
return SR_ERR;
}
return SR_ERR;
}
- session = sr_session_new();
+ sr_session_new();
devcnt = 0;
capturefiles = g_ptr_array_new_with_free_func(g_free);
continue;
if (!strncmp(sections[i], "device ", 7)) {
/* device section */
- dev = NULL;
+ sdi = NULL;
enabled_probes = 0;
keys = g_key_file_get_keys(kf, sections[i], NULL, NULL);
for (j = 0; keys[j]; j++) {
val = g_key_file_get_string(kf, sections[i], keys[j], NULL);
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)
- /* first device, init the plugin */
- dev->plugin->init((char *)filename);
- sr_session_dev_add(dev);
- dev->plugin->config_set(devcnt, SR_HWCAP_CAPTUREFILE, val);
+ /* first device, init the driver */
+ sdi->driver->init();
+ sr_session_dev_add(sdi);
+ sdi->driver->dev_config_set(sdi, SR_HWCAP_SESSIONFILE, filename);
+ sdi->driver->dev_config_set(sdi, SR_HWCAP_CAPTUREFILE, val);
g_ptr_array_add(capturefiles, val);
} else if (!strcmp(keys[j], "samplerate")) {
sr_parse_sizestring(val, &tmp_u64);
- dev->plugin->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")) {
tmp_u64 = strtoull(val, NULL, 10);
- dev->plugin->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")) {
total_probes = strtoull(val, NULL, 10);
- dev->plugin->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++) {
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)) {
- if (!dev)
+ if (!sdi)
continue;
enabled_probes++;
tmp_u64 = strtoul(keys[j]+5, NULL, 10);
- sr_dev_probe_name(dev, tmp_u64, val);
+ sr_dev_probe_name_set(sdi, tmp_u64, val);
} else if (!strncmp(keys[j], "trigger", 7)) {
probenum = strtoul(keys[j]+7, NULL, 10);
- sr_dev_trigger_set(dev, probenum, val);
+ sr_dev_trigger_set(sdi, probenum, val);
}
}
g_strfreev(keys);
- for (p = enabled_probes; p < total_probes; p++) {
- probe = g_slist_nth_data(dev->probes, p);
- probe->enabled = FALSE;
- }
+ for (p = enabled_probes; p < total_probes; p++)
+ sr_dev_probe_enable(sdi, p, FALSE);
}
+ devcnt++;
}
g_strfreev(sections);
g_key_file_free(kf);
{
GSList *l, *p, *d;
FILE *meta;
- struct sr_dev *dev;
+ struct sr_dev_inst *sdi;
struct sr_probe *probe;
struct sr_datastore *ds;
struct zip *zipfile;
struct zip_source *versrc, *metasrc, *logicsrc;
- int bufcnt, devcnt, tmpfile, ret, error, probecnt;
+ int bufcnt, devcnt, tmpfile, ret, probecnt;
uint64_t samplerate;
char version[1], rawname[16], metafile[32], *buf, *s;
/* Quietly delete it first, libzip wants replace ops otherwise. */
unlink(filename);
- if (!(zipfile = zip_open(filename, ZIP_CREATE, &error)))
+ if (!(zipfile = zip_open(filename, ZIP_CREATE, &ret)))
return SR_ERR;
/* "version" */
dev = l->data;
/* metadata */
fprintf(meta, "[device %d]\n", devcnt);
- if (dev->plugin)
- fprintf(meta, "driver = %s\n", dev->plugin->name);
+ if (dev->driver)
+ fprintf(meta, "driver = %s\n", dev->driver->name);
ds = dev->datastore;
if (ds) {
fprintf(meta, "unitsize = %d\n", ds->ds_unitsize);
fprintf(meta, "total probes = %d\n", g_slist_length(dev->probes));
if (sr_dev_has_hwcap(dev, SR_HWCAP_SAMPLERATE)) {
- samplerate = *((uint64_t *) dev->plugin->dev_info_get(
- dev->plugin_index, SR_DI_CUR_SAMPLERATE));
+ samplerate = *((uint64_t *) dev->driver->dev_info_get(
+ dev->driver_index, SR_DI_CUR_SAMPLERATE));
s = sr_samplerate_string(samplerate);
fprintf(meta, "samplerate = %s\n", s);
g_free(s);
projects / libsigrok.git / blobdiff