#include <errno.h>
#include <glib.h>
#include <glib/gstdio.h>
-#include "config.h" /* Needed for PACKAGE_VERSION and others. */
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h"
/** @cond PRIVATE */
extern SR_PRIV struct sr_dev_driver session_driver;
static int session_driver_initialized = 0;
-
/** @private */
SR_PRIV int sr_sessionfile_check(const char *filename)
{
/**
* Load the session from the specified filename.
*
+ * @param ctx The context in which to load the session.
* @param filename The name of the session file to load.
* @param session The session to load the file into.
*
* @retval SR_ERR_DATA Malformed session file
* @retval SR_ERR This is not a session file
*/
-SR_API int sr_session_load(const char *filename, struct sr_session **session)
+SR_API int sr_session_load(struct sr_context *ctx, const char *filename,
+ struct sr_session **session)
{
GKeyFile *kf;
GPtrArray *capturefiles;
struct sr_dev_inst *sdi;
struct sr_channel *ch;
int ret, i, j;
- uint64_t tmp_u64, total_channels, enabled_channels, p;
+ uint64_t tmp_u64, total_channels, p;
char **sections, **keys, *metafile, *val;
char channelname[SR_MAX_CHANNELNAME_LEN + 1];
return SR_ERR;
}
- if ((ret = sr_session_new(session)) != SR_OK)
+ if ((ret = sr_session_new(ctx, session)) != SR_OK)
return ret;
ret = SR_OK;
if (!strncmp(sections[i], "device ", 7)) {
/* device section */
sdi = NULL;
- enabled_channels = total_channels = 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")) {
- sdi = sr_dev_inst_new(SR_ST_ACTIVE, NULL, NULL, NULL);
+ sdi = g_malloc0(sizeof(struct sr_dev_inst));
sdi->driver = &session_driver;
+ sdi->status = SR_ST_ACTIVE;
if (!session_driver_initialized) {
/* first device, init the driver */
session_driver_initialized = 1;
- sdi->driver->init(NULL);
+ sdi->driver->init(sdi->driver, NULL);
}
sr_dev_open(sdi);
sr_session_dev_add(*session, sdi);
+ (*session)->owned_devs = g_slist_append(
+ (*session)->owned_devs, sdi);
sdi->driver->config_set(SR_CONF_SESSIONFILE,
g_variant_new_string(filename), sdi, NULL);
sdi->driver->config_set(SR_CONF_CAPTUREFILE,
g_variant_new_uint64(total_channels), sdi, NULL);
for (p = 0; p < total_channels; p++) {
snprintf(channelname, SR_MAX_CHANNELNAME_LEN, "%" PRIu64, p);
- if (!(ch = sr_channel_new(p, SR_CHANNEL_LOGIC, TRUE,
- channelname)))
- return SR_ERR;
- sdi->channels = g_slist_append(sdi->channels, ch);
+ sr_channel_new(sdi, p, SR_CHANNEL_LOGIC, FALSE,
+ channelname);
}
} else if (!strncmp(keys[j], "probe", 5)) {
if (!sdi) {
ret = SR_ERR_DATA;
break;
}
- enabled_channels++;
- tmp_u64 = strtoul(keys[j]+5, NULL, 10);
+ tmp_u64 = strtoul(keys[j]+5, NULL, 10) - 1;
+ ch = g_slist_nth_data(sdi->channels, tmp_u64);
/* sr_session_save() */
- sr_dev_channel_name_set(sdi, tmp_u64 - 1, val);
+ sr_dev_channel_name_set(ch, val);
+ sr_dev_channel_enable(ch, TRUE);
}
}
g_strfreev(keys);
- /* Disable channels not specifically listed. */
- if (total_channels)
- for (p = enabled_channels; p < total_channels; p++)
- sr_dev_channel_enable(sdi, p, FALSE);
}
}
g_strfreev(sections);
close(tmpfile);
meta = g_fopen(metafile, "wb");
fprintf(meta, "[global]\n");
- fprintf(meta, "sigrok version = %s\n", PACKAGE_VERSION);
+ fprintf(meta, "sigrok version = %s\n", SR_PACKAGE_VERSION_STRING);
/* metadata */
fprintf(meta, "[device 1]\n");