sr/drivers: obsolete SR_HWCAP_PROBECONFIG

[libsigrok.git] / libsigrok.h

diff --git a/libsigrok.h b/libsigrok.h
index 911319a9b8c398892b376ab5fb7af94570e321b5..75f6c3c26b6a362b77c1a452aa5c15afbfd5ca63 100644 (file)
--- a/libsigrok.h
+++ b/libsigrok.h
@@ -251,6 +251,7 @@ struct sr_dev {
 
 enum {
        SR_PROBE_LOGIC,
+       SR_PROBE_ANALOG,
 };
 
 struct sr_probe {
@@ -304,10 +305,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 +432,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. */
@@ -490,20 +484,19 @@ struct sr_dev_driver {
        GSList *(*scan) (GSList *options);
 
        /* Device-specific */
-       int (*dev_open) (int dev_index);
-       int (*dev_close) (int dev_index);
-       /* 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 (*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_status_get) (int dev_index);
        int (*dev_config_set) (const struct sr_dev_inst *sdi, int hwcap,
                        const void *value);
-       int (*dev_acquisition_start) (int dev_index, void *session_dev_id);
-       int (*dev_acquisition_stop) (int dev_index, void *session_dev_id);
+       int (*dev_acquisition_start) (const struct sr_dev_inst *sdi,
+                       void *cb_data);
+       int (*dev_acquisition_stop) (const struct sr_dev_inst *sdi,
+                       void *cb_data);
 
        /* Dynamic */
-       GSList *instances;
+       void *priv;
 };
 
 struct sr_session {
@@ -512,7 +505,6 @@ struct sr_session {
        /* list of sr_receive_data_callback_t */
        GSList *datafeed_callbacks;
        GTimeVal starttime;
-       gboolean running;
 
        unsigned int num_sources;