return SR_OK;
}
-SR_PRIV ssize_t ResourceReader::read_callback(const struct sr_resource *res,
+SR_PRIV gssize ResourceReader::read_callback(const struct sr_resource *res,
void *buf, size_t count, void *cb_data) noexcept
{
try {
if (struct sr_dev_driver **driver_list = sr_driver_list(_structure))
for (int i = 0; driver_list[i]; i++) {
unique_ptr<Driver> driver {new Driver{driver_list[i]}};
- _drivers.emplace(driver->name(), move(driver));
+ _drivers.insert(make_pair(driver->name(), move(driver)));
}
if (const struct sr_input_module **input_list = sr_input_list())
for (int i = 0; input_list[i]; i++) {
unique_ptr<InputFormat> input {new InputFormat{input_list[i]}};
- _input_formats.emplace(input->name(), move(input));
+ _input_formats.insert(make_pair(input->name(), move(input)));
}
if (const struct sr_output_module **output_list = sr_output_list())
for (int i = 0; output_list[i]; i++) {
unique_ptr<OutputFormat> output {new OutputFormat{output_list[i]}};
- _output_formats.emplace(output->name(), move(output));
+ _output_formats.insert(make_pair(output->name(), move(output)));
}
}
{
const auto &name = entry.first;
const auto &driver = entry.second;
- result.emplace(name, driver->share_owned_by(shared_from_this()));
+ result.insert({name, driver->share_owned_by(shared_from_this())});
}
return result;
}
{
const auto &name = entry.first;
const auto &input_format = entry.second;
- result.emplace(name, input_format->share_owned_by(shared_from_this()));
+ result.insert({name, input_format->share_owned_by(shared_from_this())});
}
return result;
}
{
const auto &name = entry.first;
const auto &output_format = entry.second;
- result.emplace(name, output_format->share_owned_by(shared_from_this()));
+ result.insert({name, output_format->share_owned_by(shared_from_this())});
}
return result;
}
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)
{
{
}
+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;
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) :
{
auto *const ch = static_cast<struct sr_channel *>(entry->data);
unique_ptr<Channel> channel {new Channel{ch}};
- _channels.emplace(ch, move(channel));
+ _channels.insert(make_pair(ch, move(channel)));
}
for (GSList *entry = sr_dev_inst_channel_groups_get(structure); entry; entry = entry->next)
{
auto *const cg = static_cast<struct sr_channel_group *>(entry->data);
unique_ptr<ChannelGroup> group {new ChannelGroup{this, cg}};
- _channel_groups.emplace(group->name(), move(group));
+ _channel_groups.insert(make_pair(group->name(), move(group)));
}
}
{
const auto &name = entry.first;
const auto &channel_group = entry.second;
- result.emplace(name, channel_group->share_owned_by(get_shared_from_this()));
+ result.insert({name, channel_group->share_owned_by(get_shared_from_this())});
}
return result;
}
GSList *const last = g_slist_last(sr_dev_inst_channels_get(Device::_structure));
auto *const ch = static_cast<struct sr_channel *>(last->data);
unique_ptr<Channel> channel {new Channel{ch}};
- _channels.emplace(ch, move(channel));
+ _channels.insert(make_pair(ch, move(channel)));
return get_channel(ch);
}
for (GSList *dev = dev_list; dev; dev = dev->next) {
auto *const sdi = static_cast<struct sr_dev_inst *>(dev->data);
unique_ptr<SessionDevice> device {new SessionDevice{sdi}};
- _owned_devices.emplace(sdi, move(device));
+ _owned_devices.insert(make_pair(sdi, move(device)));
}
_context->_session = this;
}
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;
}
shared_ptr<Option> opt {
new Option{options[i], option_array},
default_delete<Option>{}};
- result.emplace(opt->id(), move(opt));
+ result.insert({opt->id(), move(opt)});
}
}
return result;
shared_ptr<Option> opt {
new Option{options[i], option_array},
default_delete<Option>{}};
- result.emplace(opt->id(), move(opt));
+ result.insert({opt->id(), move(opt)});
}
}
return result;
projects / libsigrok.git / blobdiff