Rename sr_driver_scan_options() to sr_driver_scan_options_list().

[libsigrok.git] / bindings / cxx / classes.cpp

diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp
index 5cab6ac9919c4ff9249161f4decec004c21dea30..3be1d99477d45818bd94598ff7a3b5391ff5599a 100644 (file)
--- a/bindings/cxx/classes.cpp
+++ b/bindings/cxx/classes.cpp
@@ -406,6 +406,16 @@ string Driver::long_name() const
        return valid_string(_structure->longname);
 }
 
+set<const ConfigKey *> Driver::scan_options() const
+{
+       GArray *opts = sr_driver_scan_options_list(_structure);
+       set<const ConfigKey *> result;
+       for (guint i = 0; i < opts->len; i++)
+               result.insert(ConfigKey::get(g_array_index(opts, uint32_t, i)));
+       g_array_free(opts, TRUE);
+       return result;
+}
+
 vector<shared_ptr<HardwareDevice>> Driver::scan(
        map<const ConfigKey *, Glib::VariantBase> options)
 {
@@ -466,6 +476,21 @@ Configurable::~Configurable()
 {
 }
 
+set<const ConfigKey *> Configurable::config_keys() const
+{
+       GArray *opts;
+       set<const ConfigKey *> result;
+
+       opts = sr_dev_options(config_driver, config_sdi, config_channel_group);
+
+       for (guint i = 0; i < opts->len; i++)
+               result.insert(ConfigKey::get(g_array_index(opts, uint32_t, i)));
+
+       g_array_free(opts, TRUE);
+
+       return result;
+}
+
 Glib::VariantBase Configurable::config_get(const ConfigKey *key) const
 {
        GVariant *data;
@@ -482,73 +507,36 @@ void Configurable::config_set(const ConfigKey *key, const Glib::VariantBase &val
                key->id(), const_cast<GVariant*>(value.gobj())));
 }
 
-Glib::VariantContainerBase Configurable::config_list(const ConfigKey *key) const
+set<const Capability *> Configurable::config_capabilities(const ConfigKey *key) const
 {
-       GVariant *data;
-       check(sr_config_list(
-               config_driver, config_sdi, config_channel_group,
-               key->id(), &data));
-       return Glib::VariantContainerBase(data);
-}
+       int caps = sr_dev_config_capabilities_list(config_sdi,
+                               config_channel_group, key->id());
 
-map<const ConfigKey *, set<Capability>> Configurable::config_keys(const ConfigKey *key)
-{
-       GVariant *gvar_opts;
-       gsize num_opts;
-       const uint32_t *opts;
-       map<const ConfigKey *, set<Capability>> result;
+       set<const Capability *> result;
 
-       check(sr_config_list(
-               config_driver, config_sdi, config_channel_group,
-               key->id(), &gvar_opts));
-
-       opts = static_cast<const uint32_t *>(g_variant_get_fixed_array(
-               gvar_opts, &num_opts, sizeof(uint32_t)));
-
-       for (gsize i = 0; i < num_opts; i++)
-       {
-               auto key = ConfigKey::get(opts[i] & SR_CONF_MASK);
-               set<Capability> capabilities;
-               if (opts[i] & SR_CONF_GET)
-                       capabilities.insert(GET);
-               if (opts[i] & SR_CONF_SET)
-                       capabilities.insert(SET);
-               if (opts[i] & SR_CONF_LIST)
-                       capabilities.insert(LIST);
-               result[key] = capabilities;
-       }
-
-       g_variant_unref(gvar_opts);
+       for (auto cap: Capability::values())
+               if (caps & cap->id())
+                       result.insert(cap);
 
        return result;
 }
 
 bool Configurable::config_check(const ConfigKey *key,
-       const ConfigKey *index_key) const
+       const Capability *capability) const
 {
-       GVariant *gvar_opts;
-       gsize num_opts;
-       const uint32_t *opts;
-
-       if (sr_config_list(config_driver, config_sdi, config_channel_group,
-                       index_key->id(), &gvar_opts) != SR_OK)
-               return false;
-
-       opts = static_cast<const uint32_t *>(g_variant_get_fixed_array(
-               gvar_opts, &num_opts, sizeof(uint32_t)));
-
-       for (gsize i = 0; i < num_opts; i++)
-       {
-               if ((opts[i] & SR_CONF_MASK) == unsigned(key->id()))
-               {
-                       g_variant_unref(gvar_opts);
-                       return true;
-               }
-       }
+       int caps = sr_dev_config_capabilities_list(config_sdi,
+                               config_channel_group, key->id());
 
-       g_variant_unref(gvar_opts);
+       return (caps & capability->id());
+}
 
-       return false;
+Glib::VariantContainerBase Configurable::config_list(const ConfigKey *key) const
+{
+       GVariant *data;
+       check(sr_config_list(
+               config_driver, config_sdi, config_channel_group,
+               key->id(), &data));
+       return Glib::VariantContainerBase(data);
 }
 
 Device::Device(struct sr_dev_inst *structure) :
@@ -1140,7 +1128,7 @@ map<const ConfigKey *, Glib::VariantBase> Meta::config() const
        map<const ConfigKey *, Glib::VariantBase> result;
        for (auto l = _structure->config; l; l = l->next) {
                auto *const config = static_cast<struct sr_config *>(l->data);
-               result[ConfigKey::get(config->key)] = Glib::VariantBase(config->data);
+               result[ConfigKey::get(config->key)] = Glib::VariantBase(config->data, true);
        }
        return result;
 }