#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_driver session_driver;
struct zip_stat zs;
struct sr_dev *dev;
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;
}
dev = sr_dev_new(&session_driver, devcnt);
if (devcnt == 0)
/* first device, init the driver */
- dev->driver->init((char *)filename);
+ dev->driver->init();
sr_session_dev_add(dev);
+ dev->driver->dev_config_set(devcnt, SR_HWCAP_SESSIONFILE, filename);
dev->driver->dev_config_set(devcnt, SR_HWCAP_CAPTUREFILE, val);
g_ptr_array_add(capturefiles, val);
} else if (!strcmp(keys[j], "samplerate")) {
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" */