genericdmm: use new scan API

[libsigrok.git] / libsigrok.h

diff --git a/libsigrok.h b/libsigrok.h
index 0ba97bcee7658d888aece508578df0e1b6865ba3..2b07236a53136d9e1ac16473e2b43085df7111c6 100644 (file)
--- a/libsigrok.h
+++ b/libsigrok.h
@@ -250,7 +250,7 @@ struct sr_dev {
 };
 
 enum {
-       SR_PROBE_TYPE_LOGIC,
+       SR_PROBE_LOGIC,
 };
 
 struct sr_probe {
@@ -402,6 +402,7 @@ struct sr_dev_inst {
        char *vendor;
        char *model;
        char *version;
+       GSList *probes;
        void *priv;
 };
 
@@ -478,7 +479,7 @@ struct sr_dev_driver {
        int api_version;
        int (*init) (void);
        int (*cleanup) (void);
-       int (*scan) (void);
+       GSList *(*scan) (GSList *options);
 
        /* Device-specific */
        int (*dev_open) (int dev_index);
@@ -489,6 +490,9 @@ struct sr_dev_driver {
        int (*dev_config_set) (int dev_index, 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);
+
+       /* Dynamic */
+       GSList *instances;
 };
 
 struct sr_session {