sr: convert session load/save code to use sr_dev_inst

[libsigrok.git] / proto.h

diff --git a/proto.h b/proto.h
index a00c6ba76b7a523d16c25deabfe5390a3a0a6401..d25ce2ec86700ebaf7551bf536bf1a2c2a1846ea 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -57,8 +57,8 @@ SR_API struct sr_probe *sr_dev_probe_find(const struct sr_dev *dev,
 SR_API int sr_dev_probe_name_set(struct sr_dev *dev, int probenum,
                                 const char *name);
 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 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 *dev, int hwcap);
 SR_API int sr_dev_info_get(const struct sr_dev *dev, int id, const void **data);
 
@@ -73,8 +73,12 @@ SR_API int sr_filter_probes(int in_unitsize, int out_unitsize,
 
 SR_API struct sr_dev_driver **sr_driver_list(void);
 SR_API int sr_driver_init(struct sr_dev_driver *driver);
+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 -------------------------------------------------------------*/
 
@@ -141,4 +145,9 @@ SR_API int sr_lib_version_revision_get(void);
 SR_API int sr_lib_version_age_get(void);
 SR_API const char *sr_lib_version_string_get(void);
 
+/*--- error.c ---------------------------------------------------------------*/
+
+SR_API const char *sr_strerror(int error_code);
+SR_API const char *sr_strerror_name(int error_code);
+
 #endif