X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=include%2Flibsigrok%2Flibsigrok.h;h=7dcea492f4450f0dadfa543e2b8346a7698581ca;hb=f14e6f7e1aab7f2ccfdffe6540d162f292c00a2c;hp=6ab0ea2c6f333e33c76ade4fd401cac9592ff05e;hpb=3d70d77709b023499b09e7d0f0e3c20f3c58f140;p=libsigrok.git

diff --git a/include/libsigrok/libsigrok.h b/include/libsigrok/libsigrok.h
index 6ab0ea2c..7dcea492 100644
--- a/include/libsigrok/libsigrok.h
+++ b/include/libsigrok/libsigrok.h
@@ -650,11 +650,11 @@ struct sr_key_info {
 /** Configuration capabilities. */
 enum sr_configcap {
 	/** Value can be read. */
-	SR_CONF_GET = (1 << 31),
+	SR_CONF_GET = (1UL << 31),
 	/** Value can be written. */
-	SR_CONF_SET = (1 << 30),
+	SR_CONF_SET = (1UL << 30),
 	/** Possible values can be enumerated. */
-	SR_CONF_LIST = (1 << 29),
+	SR_CONF_LIST = (1UL << 29),
 };
 
 /** Configuration keys */
@@ -956,6 +956,8 @@ enum sr_configkey {
 	 * Channel regulation
 	 * get: "CV", "CC" or "UR", denoting constant voltage, constant current
 	 *      or unregulated.
+	 *      "CC-" denotes a power supply in current sink mode (e.g. HP 66xxB).
+	 *      "" is used when there is no regulation, e.g. the output is disabled.
 	 */
 	SR_CONF_REGULATION,
 
@@ -983,11 +985,41 @@ enum sr_configkey {
 	/** Under-voltage condition active. */
 	SR_CONF_UNDER_VOLTAGE_CONDITION_ACTIVE,
 
+	/** Trigger level. */
+	SR_CONF_TRIGGER_LEVEL,
+
 	/** Under-voltage condition threshold. */
 	SR_CONF_UNDER_VOLTAGE_CONDITION_THRESHOLD,
 
-	/** Trigger level. */
-	SR_CONF_TRIGGER_LEVEL,
+	/**
+	 * Which external clock source to use if the device supports
+	 * multiple external clock channels.
+	 */
+	SR_CONF_EXTERNAL_CLOCK_SOURCE,
+
+	/** 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,
+
+	/** The measurement range of a DMM or the output range of a power supply. */
+	SR_CONF_RANGE,
+
+	/** The number of digits (e.g. for a DMM). */
+	SR_CONF_DIGITS,
 
 	/* Update sr_key_info_config[] (hwdriver.c) upon changes! */