From: Uwe Hermann <redacted>
Date: Tue, 30 Jul 2019 18:50:47 +0000 (+0200)
Subject: config keys: Revert re-orderings to avoid ABI changes.
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=ea9e7a3e82ec1513fabbabc4697651972d67d2d4;p=libsigrok.git

config keys: Revert re-orderings to avoid ABI changes.
---

diff --git a/include/libsigrok/libsigrok.h b/include/libsigrok/libsigrok.h
index 63dc483b..a367ddef 100644
--- a/include/libsigrok/libsigrok.h
+++ b/include/libsigrok/libsigrok.h
@@ -767,21 +767,9 @@ enum sr_configkey {
 	/** The device supports run-length encoding (RLE). */
 	SR_CONF_RLE,
 
-	/** Trigger source. */
-	SR_CONF_TRIGGER_SOURCE,
-
 	/** The device supports setting trigger slope. */
 	SR_CONF_TRIGGER_SLOPE,
 
-	/** The device supports setting a pattern for the logic trigger. */
-	SR_CONF_TRIGGER_PATTERN,
-
-	/** High resolution mode. */
-	SR_CONF_HIGH_RESOLUTION,
-
-	/** Peak detection. */
-	SR_CONF_PEAK_DETECTION,
-
 	/** The device supports averaging. */
 	SR_CONF_AVERAGING,
 
@@ -791,6 +779,9 @@ enum sr_configkey {
 	 */
 	SR_CONF_AVG_SAMPLES,
 
+	/** Trigger source. */
+	SR_CONF_TRIGGER_SOURCE,
+
 	/** Horizontal trigger position. */
 	SR_CONF_HORIZ_TRIGGERPOS,
 
@@ -839,12 +830,6 @@ enum sr_configkey {
 	/** Logic low-high threshold range. */
 	SR_CONF_VOLTAGE_THRESHOLD,
 
-	/** Logic threshold: predefined levels (TTL, ECL, CMOS, etc). */
-	SR_CONF_LOGIC_THRESHOLD,
-
-	/** Logic threshold: custom numerical value. */
-	SR_CONF_LOGIC_THRESHOLD_CUSTOM,
-
 	/** The device supports using an external clock. */
 	SR_CONF_EXTERNAL_CLOCK,
 
@@ -1015,6 +1000,21 @@ enum sr_configkey {
 	/** Offset of a source without strictly-defined MQ. */
 	SR_CONF_OFFSET,
 
+	/** The device supports setting a pattern for the logic trigger. */
+	SR_CONF_TRIGGER_PATTERN,
+
+	/** High resolution mode. */
+	SR_CONF_HIGH_RESOLUTION,
+
+	/** Peak detection. */
+	SR_CONF_PEAK_DETECTION,
+
+	/** Logic threshold: predefined levels (TTL, ECL, CMOS, etc). */
+	SR_CONF_LOGIC_THRESHOLD,
+
+	/** Logic threshold: custom numerical value. */
+	SR_CONF_LOGIC_THRESHOLD_CUSTOM,
+
 	/* Update sr_key_info_config[] (hwdriver.c) upon changes! */
 
 	/*--- Special stuff -------------------------------------------------*/
diff --git a/src/hwdriver.c b/src/hwdriver.c
index 342abeb9..38d74964 100644
--- a/src/hwdriver.c
+++ b/src/hwdriver.c
@@ -81,20 +81,14 @@ static struct sr_key_info sr_key_info_config[] = {
 		"Pattern", NULL},
 	{SR_CONF_RLE, SR_T_BOOL, "rle",
 		"Run length encoding", NULL},
-	{SR_CONF_TRIGGER_SOURCE, SR_T_STRING, "triggersource",
-		"Trigger source", NULL},
 	{SR_CONF_TRIGGER_SLOPE, SR_T_STRING, "triggerslope",
 		"Trigger slope", NULL},
-	{SR_CONF_TRIGGER_PATTERN, SR_T_STRING, "triggerpattern",
-		"Trigger pattern", NULL},
-	{SR_CONF_HIGH_RESOLUTION, SR_T_BOOL, "highresolution",
-		"High resolution", NULL},
-	{SR_CONF_PEAK_DETECTION, SR_T_BOOL, "peakdetection",
-		"Peak detection", NULL},
 	{SR_CONF_AVERAGING, SR_T_BOOL, "averaging",
 		"Averaging", NULL},
 	{SR_CONF_AVG_SAMPLES, SR_T_UINT64, "avg_samples",
 		"Number of samples to average over", NULL},
+	{SR_CONF_TRIGGER_SOURCE, SR_T_STRING, "triggersource",
+		"Trigger source", NULL},
 	{SR_CONF_HORIZ_TRIGGERPOS, SR_T_FLOAT, "horiz_triggerpos",
 		"Horizontal trigger position", NULL},
 	{SR_CONF_BUFFERSIZE, SR_T_UINT64, "buffersize",
@@ -127,10 +121,6 @@ static struct sr_key_info sr_key_info_config[] = {
 		"Hold min", NULL},
 	{SR_CONF_VOLTAGE_THRESHOLD, SR_T_DOUBLE_RANGE, "voltage_threshold",
 		"Voltage threshold", NULL },
-	{SR_CONF_LOGIC_THRESHOLD, SR_T_STRING, "logic_threshold",
-		"Logic threshold (predefined)", NULL},
-	{SR_CONF_LOGIC_THRESHOLD_CUSTOM, SR_T_FLOAT, "logic_threshold_custom",
-		"Logic threshold (custom)", NULL},
 	{SR_CONF_EXTERNAL_CLOCK, SR_T_BOOL, "external_clock",
 		"External clock mode", NULL},
 	{SR_CONF_SWAP, SR_T_BOOL, "swap",
@@ -195,6 +185,16 @@ static struct sr_key_info sr_key_info_config[] = {
 		"External clock source", NULL},
 	{SR_CONF_OFFSET, SR_T_FLOAT, "offset",
 		"Offset", NULL},
+	{SR_CONF_TRIGGER_PATTERN, SR_T_STRING, "triggerpattern",
+		"Trigger pattern", NULL},
+	{SR_CONF_HIGH_RESOLUTION, SR_T_BOOL, "highresolution",
+		"High resolution", NULL},
+	{SR_CONF_PEAK_DETECTION, SR_T_BOOL, "peakdetection",
+		"Peak detection", NULL},
+	{SR_CONF_LOGIC_THRESHOLD, SR_T_STRING, "logic_threshold",
+		"Logic threshold (predefined)", NULL},
+	{SR_CONF_LOGIC_THRESHOLD_CUSTOM, SR_T_FLOAT, "logic_threshold_custom",
+		"Logic threshold (custom)", NULL},
 
 	/* Special stuff */
 	{SR_CONF_SESSIONFILE, SR_T_STRING, "sessionfile",