sr: add continuity MQ

[libsigrok.git] / libsigrok.h

diff --git a/libsigrok.h b/libsigrok.h
index 33d28697adf06d3a446cad78e536a9ceeecc2cf5..0d43843c16178ba4de82ed0642ae35cb35b6e0f2 100644 (file)
--- a/libsigrok.h
+++ b/libsigrok.h
@@ -145,6 +145,7 @@ enum {
        SR_MQ_TEMPERATURE,
        SR_MQ_FREQUENCY,
        SR_MQ_DUTY_CYCLE,
+       SR_MQ_CONTINUITY,
 };
 
 /* sr_datafeed_analog.unit values */
@@ -251,6 +252,7 @@ struct sr_dev {
 
 enum {
        SR_PROBE_LOGIC,
+       SR_PROBE_ANALOG,
 };
 
 struct sr_probe {
@@ -304,10 +306,6 @@ enum {
        /** The device supports setting/changing its samplerate. */
        SR_HWCAP_SAMPLERATE,
 
-       /* TODO: Better description? Rename to PROBE_AND_TRIGGER_CONFIG? */
-       /** The device supports setting a probe mask. */
-       SR_HWCAP_PROBECONFIG,
-
        /** The device supports setting a pre/post-trigger capture ratio. */
        SR_HWCAP_CAPTURE_RATIO,
 
@@ -435,9 +433,6 @@ enum {
 
 /* Device info IDs */
 enum {
-       /* struct sr_dev_inst for this specific device */
-       /* TODO: obsolete */
-       SR_DI_INST,
        /* A list of options supported by the driver. */
        SR_DI_HWOPTS,
        /* A list of capabilities supported by the device. */
@@ -488,15 +483,14 @@ struct sr_dev_driver {
        int (*init) (void);
        int (*cleanup) (void);
        GSList *(*scan) (GSList *options);
+       GSList *(*dev_list) (void);
+       int (*dev_clear) (void);
 
        /* Device-specific */
        int (*dev_open) (struct sr_dev_inst *sdi);
        int (*dev_close) (struct sr_dev_inst *sdi);
-       /* TODO remove this */
-       const void *(*dev_info_get) (int dev_index, int dev_info_id);
-       int (*info_get) (int dev_info_id, const void **data,
+       int (*info_get) (int info_id, const void **data,
                        const struct sr_dev_inst *sdi);
-       int (*dev_status_get) (int dev_index);
        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,
@@ -505,7 +499,7 @@ struct sr_dev_driver {
                        void *cb_data);
 
        /* Dynamic */
-       GSList *instances;
+       void *priv;
 };
 
 struct sr_session {
@@ -514,7 +508,6 @@ struct sr_session {
        /* list of sr_receive_data_callback_t */
        GSList *datafeed_callbacks;
        GTimeVal starttime;
-       gboolean running;
 
        unsigned int num_sources;