X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session_file.c;h=4838a6be00566b2f0fc7fb140697bc7f4b653b2c;hb=e52e712d05419e4387704262a07e00904b2acbed;hp=3168acbac9293fb07f9beaa2b8d7af1d0ee0cdbe;hpb=035a1078fda93cf1da37d19b3a1d95311b99b00f;p=libsigrok.git

diff --git a/session_file.c b/session_file.c
index 3168acba..4838a6be 100644
--- a/session_file.c
+++ b/session_file.c
@@ -1,7 +1,7 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
- * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2013 Bert Vermeulen <bert@biot.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,14 +27,14 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "session-file: "
-#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
-#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+/* Message logging helpers with subsystem-specific prefix string. */
+#define LOG_PREFIX "session-file: "
+#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
+#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
+#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
+#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
+#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
+#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
 
 /**
  * @file
@@ -135,7 +135,7 @@ SR_API int sr_session_load(const char *filename)
 		if (!strncmp(sections[i], "device ", 7)) {
 			/* device section */
 			sdi = NULL;
-			enabled_probes = 0;
+			enabled_probes = total_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);
@@ -145,19 +145,25 @@ SR_API int sr_session_load(const char *filename)
 					if (devcnt == 0)
 						/* first device, init the driver */
 						sdi->driver->init(NULL);
+					sr_dev_open(sdi);
 					sr_session_dev_add(sdi);
-					sdi->driver->config_set(SR_CONF_SESSIONFILE, filename, sdi);
-					sdi->driver->config_set(SR_CONF_CAPTUREFILE, val, sdi);
+					sdi->driver->config_set(SR_CONF_SESSIONFILE,
+							g_variant_new_string(filename), sdi);
+					sdi->driver->config_set(SR_CONF_CAPTUREFILE,
+							g_variant_new_string(val), sdi);
 					g_ptr_array_add(capturefiles, val);
 				} else if (!strcmp(keys[j], "samplerate")) {
 					sr_parse_sizestring(val, &tmp_u64);
-					sdi->driver->config_set(SR_CONF_SAMPLERATE, &tmp_u64, sdi);
+					sdi->driver->config_set(SR_CONF_SAMPLERATE,
+							g_variant_new_uint64(tmp_u64), sdi);
 				} else if (!strcmp(keys[j], "unitsize")) {
 					tmp_u64 = strtoull(val, NULL, 10);
-					sdi->driver->config_set(SR_CONF_CAPTURE_UNITSIZE, &tmp_u64, sdi);
+					sdi->driver->config_set(SR_CONF_CAPTURE_UNITSIZE,
+							g_variant_new_uint64(tmp_u64), sdi);
 				} else if (!strcmp(keys[j], "total probes")) {
 					total_probes = strtoull(val, NULL, 10);
-					sdi->driver->config_set(SR_CONF_CAPTURE_NUM_PROBES, &total_probes, sdi);
+					sdi->driver->config_set(SR_CONF_CAPTURE_NUM_PROBES,
+							g_variant_new_uint64(total_probes), sdi);
 					for (p = 0; p < total_probes; p++) {
 						snprintf(probename, SR_MAX_PROBENAME_LEN, "%" PRIu64, p);
 						if (!(probe = sr_probe_new(p, SR_PROBE_LOGIC, TRUE,
@@ -179,8 +185,9 @@ SR_API int sr_session_load(const char *filename)
 			}
 			g_strfreev(keys);
 			/* Disable probes not specifically listed. */
-			for (p = enabled_probes; p < total_probes; p++)
-				sr_dev_probe_enable(sdi, p, FALSE);
+			if (total_probes)
+				for (p = enabled_probes; p < total_probes; p++)
+					sr_dev_probe_enable(sdi, p, FALSE);
 		}
 		devcnt++;
 	}
@@ -207,12 +214,13 @@ SR_API int sr_session_save(const char *filename, const struct sr_dev_inst *sdi,
 		unsigned char *buf, int unitsize, int units)
 {
 	GSList *l;
+	GVariant *gvar;
 	FILE *meta;
 	struct sr_probe *probe;
 	struct zip *zipfile;
 	struct zip_source *versrc, *metasrc, *logicsrc;
 	int tmpfile, ret, probecnt;
-	uint64_t *samplerate;
+	uint64_t samplerate;
 	char version[1], rawname[16], metafile[32], *s;
 
 	if (!filename) {
@@ -253,12 +261,14 @@ SR_API int sr_session_save(const char *filename, const struct sr_dev_inst *sdi,
 	fprintf(meta, "capturefile = logic-1\n");
 	fprintf(meta, "unitsize = %d\n", unitsize);
 	fprintf(meta, "total probes = %d\n", g_slist_length(sdi->probes));
-	if (sr_dev_has_hwcap(sdi, SR_CONF_SAMPLERATE)) {
-		if (sr_info_get(sdi->driver, SR_DI_CUR_SAMPLERATE,
-				(const void **)&samplerate, sdi) == SR_OK) {
-			s = sr_samplerate_string(*samplerate);
+	if (sr_dev_has_option(sdi, SR_CONF_SAMPLERATE)) {
+		if (sr_config_get(sdi->driver, SR_CONF_SAMPLERATE,
+				&gvar, sdi) == SR_OK) {
+			samplerate = g_variant_get_uint64(gvar);
+			s = sr_samplerate_string(samplerate);
 			fprintf(meta, "samplerate = %s\n", s);
 			g_free(s);
+			g_variant_unref(gvar);
 		}
 	}
 	probecnt = 1;