X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=libsigrok.h;h=e7b988c4a60afc3fe5e35ed37c9c13e0390a5ac6;hb=48a486cd3ed51cfefce271224541502f4388c225;hp=68f8ce8e498ecce1a9df21ad91897774620c1a6c;hpb=8bfdc8c4a5fc4bee4b59838bd57c6762ea0cb206;p=libsigrok.git

diff --git a/libsigrok.h b/libsigrok.h
index 68f8ce8e..e7b988c4 100644
--- 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;
 };
@@ -251,6 +251,7 @@ struct sr_dev {
 
 enum {
 	SR_PROBE_LOGIC,
+	SR_PROBE_ANALOG,
 };
 
 struct sr_probe {
@@ -398,6 +399,7 @@ struct sr_hwcap_option {
 };
 
 struct sr_dev_inst {
+	struct sr_dev_driver *driver;
 	int index;
 	int status;
 	int inst_type;
@@ -435,7 +437,12 @@ 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. */
+	SR_DI_HWCAPS,
 	/* The number of probes connected to this device */
 	SR_DI_NUM_PROBES,
 	/* The probe names on this device */
@@ -484,14 +491,16 @@ struct sr_dev_driver {
 	GSList *(*scan) (GSList *options);
 
 	/* Device-specific */
-	int (*dev_open) (int dev_index);
-	int (*dev_close) (int dev_index);
-	const void *(*dev_info_get) (int dev_index, int dev_info_id);
-	int (*dev_status_get) (int dev_index);
-	const int *(*hwcap_get_all) (void);
-	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_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_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;