sr_probe->index is no longer deprecated (for now).

[libsigrok.git] / libsigrok.h

diff --git a/libsigrok.h b/libsigrok.h
index e43338e52dc0561985e5fb3ccc6a93643c55d472..cda125c5bd0b481cb5bb65e4fe2026cb697bccb9 100644 (file)
--- a/libsigrok.h
+++ b/libsigrok.h
@@ -607,8 +607,7 @@ enum {
 
 /** Information on single probe. */
 struct sr_probe {
-       /** Number of probes, starting at 0. @deprecated The index field
-        * will go: use g_slist_length(sdi->probes) instead. */
+       /** Number of probes, starting at 0. */
        int index;
        /** Probe type (SR_PROBE_LOGIC, ...) */
        int type;
@@ -834,6 +833,9 @@ enum {
        /** Over-current protection (OCP) */
        SR_CONF_OVER_CURRENT_PROTECTION,
 
+       /** Choice of clock edge for external clock ("r" or "f"). */
+       SR_CONF_CLOCK_EDGE,
+
        /*--- Special stuff -------------------------------------------------*/
 
        /** Scan options supported by the driver. */
@@ -868,18 +870,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 ---------------------------------------------*/
 
        /**
@@ -987,6 +977,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);