demo: Keep separate counters for logic and analog sources.

[libsigrok.git] / libsigrok.h

diff --git a/libsigrok.h b/libsigrok.h
index a301132090965f2a9f89a08318440566118cdfab..ab095c9a45630b83207f64bf0c86da386d3fb33c 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. */
@@ -827,7 +854,8 @@ enum {
        /** Power off the device. */
        SR_CONF_POWER_OFF,
 
-       /** Data source for acquisition. If not present, acquisition from
+       /**
+        * Data source for acquisition. If not present, acquisition from
         * the device is always "live", i.e. acquisition starts when the
         * frontend asks and the results are sent out as soon as possible.
         *
@@ -836,7 +864,8 @@ enum {
         * there is a choice. sr_config_list() returns those choices.
         *
         * In any case if a device has live acquisition capabilities, it
-        * is always the default. */
+        * is always the default.
+        */
        SR_CONF_DATA_SOURCE,
 
        /*--- Acquisition modes ---------------------------------------------*/
@@ -946,6 +975,9 @@ struct sr_dev_driver {
        int (*config_set) (int id, GVariant *data,
                        const struct sr_dev_inst *sdi,
                        const struct sr_probe_group *probe_group);
+       int (*config_probe_set) (const struct sr_dev_inst *sdi,
+                       struct sr_probe *probe, unsigned int changes);
+       int (*config_commit) (const struct sr_dev_inst *sdi);
        int (*config_list) (int info_id, GVariant **data,
                        const struct sr_dev_inst *sdi,
                        const struct sr_probe_group *probe_group);