X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=proto.h;h=bed626989a36194dd36bfe0c3cbc3e6a2ffda56f;hb=7d4abe5a77b39c11b2187e1768339fcd11b0b763;hp=a88a6deb3c7bbca6b7edc62d314548f1e5f4dada;hpb=305de92e9d50bcabaa055d43dc27fec1c2e97cc1;p=libsigrok.git

diff --git a/proto.h b/proto.h
index a88a6deb..bed62698 100644
--- a/proto.h
+++ b/proto.h
@@ -43,14 +43,6 @@ SR_API int sr_log_callback_set_default(void);
 SR_API int sr_log_logdomain_set(const char *logdomain);
 SR_API char *sr_log_logdomain_get(void);
 
-/*--- datastore.c -----------------------------------------------------------*/
-
-SR_API int sr_datastore_new(int unitsize, struct sr_datastore **ds);
-SR_API int sr_datastore_destroy(struct sr_datastore *ds);
-SR_API int sr_datastore_put(struct sr_datastore *ds, void *data,
-			    unsigned int length, int in_unitsize,
-			    const int *probelist);
-
 /*--- device.c --------------------------------------------------------------*/
 
 SR_API int sr_dev_probe_name_set(const struct sr_dev_inst *sdi,
@@ -59,9 +51,7 @@ 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 gboolean sr_dev_has_option(const struct sr_dev_inst *sdi, int key);
 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);
 
@@ -78,13 +68,14 @@ SR_API struct sr_dev_driver **sr_driver_list(void);
 SR_API int sr_driver_init(struct sr_context *ctx,
 		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,
+SR_API int sr_config_get(struct sr_dev_driver *driver, int key,
+		const void **data, const struct sr_dev_inst *sdi);
+SR_API int sr_config_set(const struct sr_dev_inst *sdi, int key,
+		const void *value);
+SR_API int sr_config_list(struct sr_dev_driver *driver, int key,
 		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);
+SR_API const struct sr_config_info *sr_config_info_get(int key);
+SR_API const struct sr_config_info *sr_config_info_name_get(const char *optname);
 
 /*--- session.c -------------------------------------------------------------*/
 
@@ -107,8 +98,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,
-		const struct sr_dev_inst *sdi, struct sr_datastore *ds);
+SR_API int sr_session_save(const char *filename, const struct sr_dev_inst *sdi,
+		unsigned char *buf, int unitsize, int units);
 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,