X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=proto.h;h=c801f6cd19b09308081827acd43f933658d4749e;hb=1d36b4d27f737dfcd6e232bc9d9538bd64bf1afb;hp=ea74e8fedc90a187d44c2a0c13a463b1b6f1caf1;hpb=c89c1c9c211a197f24de7bfd32ecbc873dd66818;p=libsigrok.git

diff --git a/proto.h b/proto.h
index ea74e8fe..c801f6cd 100644
--- a/proto.h
+++ b/proto.h
@@ -51,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);
 
@@ -70,9 +68,12 @@ 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(const 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(const 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_config_info *sr_config_info_get(int key);
 SR_API const struct sr_config_info *sr_config_info_name_get(const char *optname);