X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fsession_file.c;h=91d4d7775f9f2223e3f4ca58f3259d8fcfa2cbcd;hb=329733d92c5004f0fe308eff26b9537fded2cdf3;hp=6433998a202ad3cb11e4aa163767a93e63ea3d9c;hpb=aac29cc192ccf82b64e77b5e6b11b411da32deed;p=libsigrok.git

diff --git a/src/session_file.c b/src/session_file.c
index 6433998a..91d4d777 100644
--- a/src/session_file.c
+++ b/src/session_file.c
@@ -49,7 +49,6 @@
 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)
 {
@@ -124,7 +123,7 @@ SR_API int sr_session_load(const char *filename, struct sr_session **session)
 	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];
 
@@ -165,7 +164,6 @@ SR_API int sr_session_load(const char *filename, struct sr_session **session)
 		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);
@@ -176,7 +174,7 @@ SR_API int sr_session_load(const char *filename, struct sr_session **session)
 					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);
@@ -213,27 +211,22 @@ SR_API int sr_session_load(const char *filename, struct sr_session **session)
 							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);