Deprecate SR_DI_TRIGGER_SOURCES.

[libsigrok.git] / libsigrok.h

diff --git a/libsigrok.h b/libsigrok.h
index 9adc16069a0596b7a993f76d208996760830d78c..9b40230ad3544a93347c9455508a306b42c5a06b 100644 (file)
--- a/libsigrok.h
+++ b/libsigrok.h
@@ -286,6 +286,7 @@ struct sr_datafeed_logic {
 };
 
 struct sr_datafeed_analog {
+       GSList *probes;
        int num_samples;
        /** Measured quantity (voltage, current, temperature, and so on). */
        int mq;
@@ -550,26 +551,8 @@ enum {
        SR_DI_HWOPTS = 10000,
        /** A list of capabilities supported by the device. */
        SR_DI_HWCAPS,
-       /** Samplerates supported by this device (struct sr_samplerates). */
-       SR_DI_SAMPLERATES,
        /** Types of logic trigger supported, out of "01crf" (char *). */
        SR_DI_TRIGGER_TYPES,
-       /** The currently set samplerate in Hz (uint64_t). */
-       SR_DI_CUR_SAMPLERATE,
-       /** Supported patterns (in pattern generator mode). */
-       SR_DI_PATTERNS,
-       /** Supported buffer sizes. */
-       SR_DI_BUFFERSIZES,
-       /** Supported time bases. */
-       SR_DI_TIMEBASES,
-       /** Supported trigger sources. */
-       SR_DI_TRIGGER_SOURCES,
-       /** Supported filter targets. */
-       SR_DI_FILTERS,
-       /** Valid volts/div values. */
-       SR_DI_VDIVS,
-       /** Coupling options. */
-       SR_DI_COUPLING,
 };
 
 /*
@@ -594,14 +577,16 @@ struct sr_dev_driver {
        GSList *(*scan) (GSList *options);
        GSList *(*dev_list) (void);
        int (*dev_clear) (void);
+       int (*config_get) (int id, const void **value,
+                       const struct sr_dev_inst *sdi);
+       int (*config_set) (int id, const void *value,
+                       const struct sr_dev_inst *sdi);
+       int (*config_list) (int info_id, const void **data,
+                       const struct sr_dev_inst *sdi);
 
        /* Device-specific */
        int (*dev_open) (struct sr_dev_inst *sdi);
        int (*dev_close) (struct sr_dev_inst *sdi);
-       int (*info_get) (int info_id, const void **data,
-                       const struct sr_dev_inst *sdi);
-       int (*dev_config_set) (const struct sr_dev_inst *sdi, int hwcap,
-                       const void *value);
        int (*dev_acquisition_start) (const struct sr_dev_inst *sdi,
                        void *cb_data);
        int (*dev_acquisition_stop) (struct sr_dev_inst *sdi,