X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=inline;f=libsigrok.h;h=c3e85c73f552451a90174f171a2beff23ab88d6f;hb=92ae7984834778dc7da128159d8e90024318909d;hp=42406d5419b568ca3077452e08be4a261000924f;hpb=47211d65b4fdaca58694a51cdbf1ba8ee4270ee9;p=libsigrok.git

diff --git a/libsigrok.h b/libsigrok.h
index 42406d54..c3e85c73 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;
 };
@@ -268,6 +268,8 @@ struct sr_hwopt {
 
 /* Hardware driver options */
 enum {
+	SR_HWOPT_DUMMY = 0, /* Used to terminate lists. Must be 0! */
+
 	/** Some drivers cannot detect the exact model they're talking to. */
 	SR_HWOPT_MODEL,
 
@@ -396,6 +398,7 @@ struct sr_hwcap_option {
 };
 
 struct sr_dev_inst {
+	struct sr_dev_driver *driver;
 	int index;
 	int status;
 	int inst_type;
@@ -433,7 +436,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 */
@@ -482,14 +490,21 @@ 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 (*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 (*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;
 };
 
 struct sr_session {