X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=proto.h;h=9ede57935a136b8e4f41d981a90b2704ddc3f60b;hb=c7ee3ddb948b2ff36acbbe79ecc812b477ff5708;hp=a1d6d7cc64e908aef8a8dda4a8c6ab44d5a9329d;hpb=8bfdc8c4a5fc4bee4b59838bd57c6762ea0cb206;p=libsigrok.git

diff --git a/proto.h b/proto.h
index a1d6d7cc..9ede5793 100644
--- a/proto.h
+++ b/proto.h
@@ -56,10 +56,12 @@ SR_API struct sr_probe *sr_dev_probe_find(const struct sr_dev *dev,
 					  int probenum);
 SR_API int sr_dev_probe_name_set(struct sr_dev *dev, int probenum,
 				 const char *name);
+SR_API int sr_dev_probe_enable(const struct sr_dev_inst *sdi, int probenum,
+		gboolean state);
 SR_API int sr_dev_trigger_remove_all(struct sr_dev *dev);
-SR_API int sr_dev_trigger_set(struct sr_dev *dev, int probenum,
-			      const char *trigger);
-SR_API gboolean sr_dev_has_hwcap(const struct sr_dev *dev, int hwcap);
+SR_API int sr_dev_trigger_set(const struct sr_dev_inst *sdi, int probenum,
+		const char *trigger);
+SR_API gboolean sr_dev_has_hwcap(const struct sr_dev_inst *sdi, int hwcap);
 SR_API int sr_dev_info_get(const struct sr_dev *dev, int id, const void **data);
 
 /*--- filter.c --------------------------------------------------------------*/
@@ -77,11 +79,13 @@ SR_API GSList *sr_driver_scan(struct sr_dev_driver *driver, GSList *options);
 SR_API gboolean sr_driver_hwcap_exists(struct sr_dev_driver *driver, int hwcap);
 SR_API const struct sr_hwcap_option *sr_drvopt_get(int hwopt);
 SR_API const struct sr_hwcap_option *sr_hw_hwcap_get(int hwcap);
+SR_API int sr_info_get(struct sr_dev_driver *driver, int id,
+		const void **data, const struct sr_dev_inst *sdi);
 
 /*--- session.c -------------------------------------------------------------*/
 
-typedef void (*sr_datafeed_callback_t)(struct sr_dev *dev,
-				       struct sr_datafeed_packet *packet);
+typedef void (*sr_datafeed_callback_t)(const struct sr_dev_inst *sdi,
+		struct sr_datafeed_packet *packet);
 
 /* Session setup */
 SR_API int sr_session_load(const char *filename);
@@ -123,8 +127,8 @@ SR_API struct sr_output_format **sr_output_list(void);
 SR_API char *sr_samplerate_string(uint64_t samplerate);
 SR_API char *sr_period_string(uint64_t frequency);
 SR_API char *sr_voltage_string(struct sr_rational *voltage);
-SR_API char **sr_parse_triggerstring(struct sr_dev *dev,
-				     const char *triggerstring);
+SR_API char **sr_parse_triggerstring(const struct sr_dev_inst *sdi,
+		const char *triggerstring);
 SR_API int sr_parse_sizestring(const char *sizestring, uint64_t *size);
 SR_API uint64_t sr_parse_timestring(const char *timestring);
 SR_API gboolean sr_parse_boolstring(const char *boolstring);