sr/drivers: change driver dev_acquisition_start/_stop calls to use sdi

[libsigrok.git] / libsigrok.h

diff --git a/libsigrok.h b/libsigrok.h
index 641ca912bf7330e18eeb6326ccacd6e4aa871eaf..33d28697adf06d3a446cad78e536a9ceeecc2cf5 100644 (file)
--- a/libsigrok.h
+++ b/libsigrok.h
@@ -194,7 +194,7 @@ struct sr_datafeed_analog {
 struct sr_input {
        struct sr_input_format *format;
        GHashTable *param;
-       struct sr_dev *vdev;
+       struct sr_dev_inst *sdi;
        void *internal;
 };
 
@@ -208,7 +208,7 @@ struct sr_input_format {
 
 struct sr_output {
        struct sr_output_format *format;
-       struct sr_dev *dev;
+       struct sr_dev_inst *sdi;
        char *param;
        void *internal;
 };
@@ -490,16 +490,19 @@ struct sr_dev_driver {
        GSList *(*scan) (GSList *options);
 
        /* Device-specific */
-       int (*dev_open) (int dev_index);
-       int (*dev_close) (int dev_index);
+       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,
                        const struct sr_dev_inst *sdi);
        int (*dev_status_get) (int dev_index);
-       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);
+       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) (const struct sr_dev_inst *sdi,
+                       void *cb_data);
 
        /* Dynamic */
        GSList *instances;