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 ecaa3c04b7412095919a16f407135924134ac910..258984ab08abdf744cc70ed69d2594e0059b3bbb 100644 (file)
--- 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 ade8277151c4e1711f4a66d7e184ea0474bad0d0..3408f4338392e8b9b3061866426fac1f3980368a 100644 (file)
--- 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,