X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=proto.h;h=6536c5a4b075b490177acdaa2a4be76f5f7eaa7c;hb=811deee4af9f600ae0c457a74d3877c4f68f2f37;hp=a00c6ba76b7a523d16c25deabfe5390a3a0a6401;hpb=aac0ea256327bdff8f2a98bf62c7ac6a42dd1e44;p=libsigrok.git

diff --git a/proto.h b/proto.h
index a00c6ba7..6536c5a4 100644
--- a/proto.h
+++ b/proto.h
@@ -47,20 +47,17 @@ SR_API int sr_datastore_put(struct sr_datastore *ds, void *data,
 
 /*--- device.c --------------------------------------------------------------*/
 
-SR_API int sr_dev_scan(void);
-SR_API GSList *sr_dev_list(void);
-SR_API struct sr_dev *sr_dev_new(const struct sr_dev_driver *driver,
-				 int driver_index);
-SR_API int sr_dev_probe_add(struct sr_dev *dev, const char *name);
-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_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_info_get(const struct sr_dev *dev, int id, const void **data);
+SR_API int sr_dev_probe_name_set(const struct sr_dev_inst *sdi,
+		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_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_config_set(const struct sr_dev_inst *sdi, int hwcap,
+		const void *value);
+SR_API GSList *sr_dev_inst_list(const struct sr_dev_driver *driver);
+SR_API int sr_dev_inst_clear(const struct sr_dev_driver *driver);
 
 /*--- filter.c --------------------------------------------------------------*/
 
@@ -73,20 +70,26 @@ 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 int sr_info_get(struct sr_dev_driver *driver, int id,
+		const void **data, const struct sr_dev_inst *sdi);
 SR_API gboolean sr_driver_hwcap_exists(struct sr_dev_driver *driver, int hwcap);
-SR_API const struct sr_hwcap_option *sr_hw_hwcap_get(int hwcap);
+SR_API const struct sr_hwcap_option *sr_drvopt_get(int opt);
+SR_API const struct sr_hwcap_option *sr_drvopt_name_get(const char *optname);
+SR_API const struct sr_hwcap_option *sr_devopt_get(int opt);
+SR_API const struct sr_hwcap_option *sr_devopt_name_get(const char *optname);
 
 /*--- 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);
 SR_API struct sr_session *sr_session_new(void);
 SR_API int sr_session_destroy(void);
 SR_API int sr_session_dev_remove_all(void);
-SR_API int sr_session_dev_add(struct sr_dev *dev);
+SR_API int sr_session_dev_add(const struct sr_dev_inst *sdi);
 
 /* Datafeed setup */
 SR_API int sr_session_datafeed_callback_remove_all(void);
@@ -97,7 +100,8 @@ SR_API int sr_session_start(void);
 SR_API int sr_session_run(void);
 SR_API int sr_session_halt(void);
 SR_API int sr_session_stop(void);
-SR_API int sr_session_save(const char *filename);
+SR_API int sr_session_save(const char *filename,
+		const struct sr_dev_inst *sdi, struct sr_datastore *ds);
 SR_API int sr_session_source_add(int fd, int events, int timeout,
 		sr_receive_data_callback_t cb, void *cb_data);
 SR_API int sr_session_source_add_pollfd(GPollFD *pollfd, int timeout,
@@ -121,8 +125,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);
@@ -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