demo: use driver-private storage for instances

[libsigrok.git] / libsigrok.h

diff --git a/libsigrok.h b/libsigrok.h
index 33d28697adf06d3a446cad78e536a9ceeecc2cf5..eda16c211eee4b723cb527a680ffe90b5ed6f885 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 {
@@ -435,9 +436,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. */
@@ -492,11 +490,8 @@ struct sr_dev_driver {
        /* 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 +500,7 @@ struct sr_dev_driver {
                        void *cb_data);
 
        /* Dynamic */
-       GSList *instances;
+       void *priv;
 };
 
 struct sr_session {