From a042fabfb6cdf200428096f6b30bcb3feb7e736f Mon Sep 17 00:00:00 2001
From: DreamSourceLab <support@dreamsourcelab.com>
Date: Tue, 29 Sep 2015 11:20:06 +0800
Subject: [PATCH] Fix probe index error when load certain probes enabled *.dsl
 file

---
 libsigrok4DSL/dsdevice.c             |  2 +-
 libsigrok4DSL/hardware/DSL/dslogic.c |  1 -
 libsigrok4DSL/hardware/demo/demo.c   |  1 -
 libsigrok4DSL/session_file.c         | 13 +++++--------
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/libsigrok4DSL/dsdevice.c b/libsigrok4DSL/dsdevice.c
index f3067c26..cbc56591 100644
--- a/libsigrok4DSL/dsdevice.c
+++ b/libsigrok4DSL/dsdevice.c
@@ -208,7 +208,7 @@ SR_API gboolean sr_dev_has_option(const struct sr_dev_inst *sdi, int key)
 	if (!sdi || !sdi->driver || !sdi->driver->config_list)
 		return FALSE;
 
-    if (sdi->driver->config_list(SR_CONF_DEVICE_OPTIONS, &gvar, NULL, NULL) != SR_OK)
+    if (sdi->driver->config_list(SR_CONF_DEVICE_OPTIONS, &gvar, sdi, NULL) != SR_OK)
 		return FALSE;
 
 	ret = FALSE;
diff --git a/libsigrok4DSL/hardware/DSL/dslogic.c b/libsigrok4DSL/hardware/DSL/dslogic.c
index 6269e28c..fced7cc4 100644
--- a/libsigrok4DSL/hardware/DSL/dslogic.c
+++ b/libsigrok4DSL/hardware/DSL/dslogic.c
@@ -107,7 +107,6 @@ static const int32_t hwcaps[] = {
     SR_CONF_SAMPLERATE,
 
 	/* These are really implemented in the driver, not the hardware. */
-    SR_CONF_MAX_HEIGHT,
     SR_CONF_LIMIT_SAMPLES,
     SR_CONF_CONTINUOUS,
 };
diff --git a/libsigrok4DSL/hardware/demo/demo.c b/libsigrok4DSL/hardware/demo/demo.c
index 0a2f28e2..df4414b7 100644
--- a/libsigrok4DSL/hardware/demo/demo.c
+++ b/libsigrok4DSL/hardware/demo/demo.c
@@ -121,7 +121,6 @@ static const int hwcaps[] = {
 	SR_CONF_DEMO_DEV,
 	SR_CONF_SAMPLERATE,
 	SR_CONF_PATTERN_MODE,
-    SR_CONF_MAX_HEIGHT,
 	SR_CONF_LIMIT_SAMPLES,
 	SR_CONF_LIMIT_MSEC,
 	SR_CONF_CONTINUOUS,
diff --git a/libsigrok4DSL/session_file.c b/libsigrok4DSL/session_file.c
index 174a8f94..5e84ee66 100644
--- a/libsigrok4DSL/session_file.c
+++ b/libsigrok4DSL/session_file.c
@@ -206,7 +206,7 @@ SR_API int sr_session_load(const char *filename)
                             g_variant_new_uint64(total_probes), sdi, NULL, NULL);
 					for (p = 0; p < total_probes; p++) {
 						snprintf(probename, SR_MAX_PROBENAME_LEN, "%" PRIu64, p);
-						if (!(probe = sr_channel_new(p, SR_CHANNEL_LOGIC, TRUE,
+                        if (!(probe = sr_channel_new(p, SR_CHANNEL_LOGIC, FALSE,
 								probename)))
 							return SR_ERR;
                         sdi->channels = g_slist_append(sdi->channels, probe);
@@ -217,17 +217,14 @@ SR_API int sr_session_load(const char *filename)
 					enabled_probes++;
 					tmp_u64 = strtoul(keys[j]+5, NULL, 10);
 					/* sr_session_save() */
-					sr_dev_probe_name_set(sdi, tmp_u64 - 1, val);
+                    sr_dev_probe_name_set(sdi, tmp_u64, val);
+                    sr_dev_probe_enable(sdi, tmp_u64, TRUE);
 				} else if (!strncmp(keys[j], "trigger", 7)) {
 					probenum = strtoul(keys[j]+7, NULL, 10);
 					sr_dev_trigger_set(sdi, probenum, val);
 				}
 			}
 			g_strfreev(keys);
-			/* Disable probes not specifically listed. */
-			if (total_probes)
-				for (p = enabled_probes; p < total_probes; p++)
-					sr_dev_probe_enable(sdi, p, FALSE);
 		}
 		devcnt++;
 	}
@@ -307,9 +304,9 @@ SR_API int sr_session_save(const char *filename, const struct sr_dev_inst *sdi,
         probe = l->data;
         if (probe->enabled) {
             if (probe->name)
-                fprintf(meta, "probe%d = %s\n", probecnt, probe->name);
+                fprintf(meta, "probe%d = %s\n", probe->index, probe->name);
             if (probe->trigger)
-                fprintf(meta, " trigger%d = %s\n", probecnt, probe->trigger);
+                fprintf(meta, " trigger%d = %s\n", probe->index, probe->trigger);
             probecnt++;
         }
     }