Rename sr_dev_config_capabilities() to sr_dev_config_capabilities_list().

diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp
index 15b94a19575d5274b5eb53baf641245dc82c8efb..eabe36a38654f65e7710f4cfeb10cfb6482ff165 100644 (file)
--- a/bindings/cxx/classes.cpp
+++ b/bindings/cxx/classes.cpp
@@ -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
 {
-       int caps = sr_dev_config_capabilities(config_sdi, config_channel_group,
-               key->id());
+       int caps = sr_dev_config_capabilities_list(config_sdi,
+                               config_channel_group, key->id());
 
        set<const Capability *> result;
 
@@ -524,8 +524,8 @@ set<const Capability *> Configurable::config_capabilities(const ConfigKey *key)
 bool Configurable::config_check(const ConfigKey *key,
        const Capability *capability) const
 {
-       int caps = sr_dev_config_capabilities(config_sdi, config_channel_group,
-               key->id());
+       int caps = sr_dev_config_capabilities_list(config_sdi,
+                               config_channel_group, key->id());
 
        return (caps & capability->id());
 }

diff --git a/include/libsigrok/proto.h b/include/libsigrok/proto.h
index 9dc128274bc72c066cf2920de156e353312ad212..3a8e346f087c6c8f86b290c9d30139cbefa9d462 100644 (file)
--- a/include/libsigrok/proto.h
+++ b/include/libsigrok/proto.h
@@ -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,
                gboolean state);
 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);
 SR_API GArray *sr_dev_options(const struct sr_dev_driver *driver,
                const struct sr_dev_inst *sdi, const struct sr_channel_group *cg);

diff --git a/src/device.c b/src/device.c
index cb400bf152bcca6bbaf00980caee6fc6c0c17ec4..e932ea20d6a6cabf894e86d2cc0e7840f80a25ef 100644 (file)
--- a/src/device.c
+++ b/src/device.c
@@ -261,7 +261,7 @@ SR_API GArray *sr_dev_options(
  *
  * @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)
 {
        GVariant *gvar;