X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=libsigrok.h;h=eda16c211eee4b723cb527a680ffe90b5ed6f885;hb=269971ddce18664a2ad06b7e2f56dcad70d155bb;hp=911319a9b8c398892b376ab5fb7af94570e321b5;hpb=5c3c1241d2e2b5d456865e876490492d76174257;p=libsigrok.git

diff --git a/libsigrok.h b/libsigrok.h
index 911319a9..eda16c21 100644
--- 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. */
@@ -490,20 +488,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 {