X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=proto.h;h=4c9286c103389d3628ce566a439c8eaaa96e7956;hb=8c012adbc15fcb00aee23f472b08b108d46b818b;hp=a882b64a43049dc03b9b33c82b5d594ef12e62d4;hpb=de4d3f99d9e76c5a51916d3bcfef89423055d43f;p=libsigrok.git

diff --git a/proto.h b/proto.h
index a882b64a..4c9286c1 100644
--- a/proto.h
+++ b/proto.h
@@ -20,10 +20,16 @@
 #ifndef LIBSIGROK_SIGROK_PROTO_H
 #define LIBSIGROK_SIGROK_PROTO_H
 
+/**
+ * @file
+ *
+ * Header file containing API function prototypes.
+ */
+
 /*--- backend.c -------------------------------------------------------------*/
 
-SR_API int sr_init(void);
-SR_API int sr_exit(void);
+SR_API int sr_init(struct sr_context **ctx);
+SR_API int sr_exit(struct sr_context *ctx);
 
 /*--- log.c -----------------------------------------------------------------*/
 
@@ -47,22 +53,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_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_remove_all(struct sr_dev *dev);
 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);
+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 --------------------------------------------------------------*/
 
@@ -76,11 +77,13 @@ 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);
+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 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 -------------------------------------------------------------*/
 
@@ -103,7 +106,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,
@@ -124,6 +128,7 @@ SR_API struct sr_output_format **sr_output_list(void);
 
 /*--- strutil.c -------------------------------------------------------------*/
 
+SR_API char *sr_si_string_u64(uint64_t x, const char *unit);
 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);