From: Aurelien Jacobs Date: Mon, 29 Sep 2014 22:37:03 +0000 (+0200) Subject: C++: handle uint32_t SR_CONF keys which contain key capabilities X-Git-Tag: libsigrok-0.4.0~934 X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=03a4c07aff345f0b603199ad17d1dad01bb67293;p=libsigrok.git C++: handle uint32_t SR_CONF keys which contain key capabilities This adapts the C++ bindings according to commits 584560f and 5827f61. --- diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp index 43350b06..7a6daa92 100644 --- a/bindings/cxx/classes.cpp +++ b/bindings/cxx/classes.cpp @@ -356,18 +356,18 @@ vector Configurable::config_keys(const ConfigKey *key) { GVariant *gvar_opts; gsize num_opts; - const int32_t *opts; + const uint32_t *opts; vector result; check(sr_config_list( config_driver, config_sdi, config_channel_group, key->id(), &gvar_opts)); - opts = (const int32_t *) g_variant_get_fixed_array( - gvar_opts, &num_opts, sizeof(int32_t)); + opts = (const uint32_t *) g_variant_get_fixed_array( + gvar_opts, &num_opts, sizeof(uint32_t)); for (gsize i = 0; i < num_opts; i++) - result.push_back(ConfigKey::get(opts[i])); + result.push_back(ConfigKey::get(opts[i] & SR_CONF_MASK)); g_variant_unref(gvar_opts); @@ -379,18 +379,18 @@ bool Configurable::config_check(const ConfigKey *key, { GVariant *gvar_opts; gsize num_opts; - const int32_t *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 = (const int32_t *) g_variant_get_fixed_array( - gvar_opts, &num_opts, sizeof(int32_t)); + opts = (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] == key->id()) + if ((opts[i] & SR_CONF_MASK) == key->id()) { g_variant_unref(gvar_opts); return true;