Remove SR_CONF_MAX_UNCOMPRESSED_SAMPLES again.

[libsigrok.git] / libsigrok.h

diff --git a/libsigrok.h b/libsigrok.h
index 239820a1169fe09a5c44d484b584a09a010a698d..7fc48cfdede3a1e8f46e5282b463048f44d20470 100644 (file)
--- a/libsigrok.h
+++ b/libsigrok.h
@@ -683,6 +683,9 @@ enum {
        /** The device can demodulate signals. */
        SR_CONF_DEMODULATOR,
 
+       /** Programmable power supply. */
+       SR_CONF_POWER_SUPPLY,
+
        /*--- Driver scan options -------------------------------------------*/
 
        /**
@@ -807,6 +810,30 @@ enum {
        /** The device supports setting the number of analog probes. */
        SR_CONF_NUM_ANALOG_PROBES,
 
+       /** Output voltage. */
+       SR_CONF_OUTPUT_VOLTAGE,
+
+       /** Maximum output voltage. */
+       SR_CONF_OUTPUT_VOLTAGE_MAX,
+
+       /** Output current. */
+       SR_CONF_OUTPUT_CURRENT,
+
+       /** Maximum output current. */
+       SR_CONF_OUTPUT_CURRENT_MAX,
+
+       /** Enabling/disabling output. */
+       SR_CONF_OUTPUT_ENABLED,
+
+       /** Channel output configuration. */
+       SR_CONF_OUTPUT_CHANNEL,
+
+       /** Over-voltage protection (OVP) */
+       SR_CONF_OVER_VOLTAGE_PROTECTION,
+
+       /** Over-current protection (OCP) */
+       SR_CONF_OVER_CURRENT_PROTECTION,
+
        /*--- Special stuff -------------------------------------------------*/
 
        /** Scan options supported by the driver. */
@@ -841,18 +868,6 @@ enum {
         */
        SR_CONF_DATA_SOURCE,
 
-       /**
-        * On devices without sample compression (or compression turned off),
-        * this returns the maximum number of samples that can be stored. This
-        * can change as probes are disabled, depending on the hardware, so
-        * should be queried after such changes are made. If not applicable,
-        * fetching this value with sr_config_get() will return SR_ERR_NA.
-        *
-        * SR_CONF_LIMIT_SAMPLES should not be set to a higher value than
-        * this value, if applicable.
-        */
-       SR_CONF_MAX_UNCOMPRESSED_SAMPLES,
-
        /*--- Acquisition modes ---------------------------------------------*/
 
        /**