From: Bert Vermeulen <redacted>
Date: Tue, 27 May 2014 21:55:26 +0000 (+0200)
Subject: Rename SR_CONF_TRIGGER_TYPE to SR_CONF_TRIGGER_MATCH.
X-Git-Tag: libsigrok-0.4.0~1310
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=795c9de35e90515e18a107f5f55f1956c7c785ee;p=libsigrok.git

Rename SR_CONF_TRIGGER_TYPE to SR_CONF_TRIGGER_MATCH.

Drivers supporting triggering need to implement this in config_list()
and return an array of int32_t consisting of SR_TRIGGER_*.
---

diff --git a/hwdriver.c b/hwdriver.c
index ecaa3c04..258984ab 100644
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -56,8 +56,8 @@ static struct sr_config_info sr_config_info_data[] = {
 		"Pre-trigger capture ratio", NULL},
 	{SR_CONF_PATTERN_MODE, SR_T_STRING, "pattern",
 		"Pattern", NULL},
-	{SR_CONF_TRIGGER_TYPE, SR_T_STRING, "triggertype",
-		"Trigger types", NULL},
+	{SR_CONF_TRIGGER_MATCH, SR_T_INT32, "triggermatch",
+		"Trigger matches", NULL},
 	{SR_CONF_EXTERNAL_CLOCK, SR_T_BOOL, "external_clock",
 		"External clock mode", NULL},
 	{SR_CONF_SWAP, SR_T_BOOL, "swap",
diff --git a/libsigrok.h b/libsigrok.h
index ade82771..3408f433 100644
--- a/libsigrok.h
+++ b/libsigrok.h
@@ -738,8 +738,8 @@ enum sr_configkey {
 	/** Coupling. */
 	SR_CONF_COUPLING,
 
-	/** Trigger types.  */
-	SR_CONF_TRIGGER_TYPE,
+	/** Trigger matches.  */
+	SR_CONF_TRIGGER_MATCH,
 
 	/** The device supports setting its sample interval, in ms. */
 	SR_CONF_SAMPLE_INTERVAL,