BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename sr_dev_config_capabilities() to sr_dev_config_capabilities_list().

This commit is contained in:
Uwe Hermann 2015-12-31 18:45:17 +01:00
parent 7d7fd93c94
commit 0c697a4b33
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bindings/cxx/classes.cpp
View File

@ -509,8 +509,8 @@ void Configurable::config_set(const ConfigKey *key, const Glib::VariantBase &val
set<const Capability *> Configurable::config_capabilities(const ConfigKey *key) const set<const Capability *> Configurable::config_capabilities(const ConfigKey *key) const
{ {
int caps = sr_dev_config_capabilities(config_sdi, config_channel_group, int caps = sr_dev_config_capabilities_list(config_sdi,
key->id()); config_channel_group, key->id());
set<const Capability *> result; set<const Capability *> result;
@ -524,8 +524,8 @@ set<const Capability *> Configurable::config_capabilities(const ConfigKey *key)
bool Configurable::config_check(const ConfigKey *key, bool Configurable::config_check(const ConfigKey *key,
const Capability *capability) const const Capability *capability) const
{ {
int caps = sr_dev_config_capabilities(config_sdi, config_channel_group, int caps = sr_dev_config_capabilities_list(config_sdi,
key->id()); config_channel_group, key->id());
return (caps & capability->id()); return (caps & capability->id());
} }

2
include/libsigrok/proto.h
View File

@ -56,7 +56,7 @@ SR_API int sr_dev_channel_name_set(struct sr_channel *channel,
SR_API int sr_dev_channel_enable(struct sr_channel *channel, SR_API int sr_dev_channel_enable(struct sr_channel *channel,
gboolean state); gboolean state);
SR_API gboolean sr_dev_has_option(const struct sr_dev_inst *sdi, int key); SR_API gboolean sr_dev_has_option(const struct sr_dev_inst *sdi, int key);
SR_API int sr_dev_config_capabilities(const struct sr_dev_inst *sdi, SR_API int sr_dev_config_capabilities_list(const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg, int key); const struct sr_channel_group *cg, int key);
SR_API GArray *sr_dev_options(const struct sr_dev_driver *driver, SR_API GArray *sr_dev_options(const struct sr_dev_driver *driver,
const struct sr_dev_inst *sdi, const struct sr_channel_group *cg); const struct sr_dev_inst *sdi, const struct sr_channel_group *cg);

2
src/device.c
View File

@ -261,7 +261,7 @@ SR_API GArray *sr_dev_options(
* *
* @since 0.4.0 * @since 0.4.0
*/ */
SR_API int sr_dev_config_capabilities(const struct sr_dev_inst *sdi, SR_API int sr_dev_config_capabilities_list(const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg, const int key) const struct sr_channel_group *cg, const int key)
{ {
GVariant *gvar; GVariant *gvar;