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 {
shared_ptr<Context> Context::create()
{
- return shared_ptr<Context>(new Context(), Context::Deleter());
+ return shared_ptr<Context>{new Context{}, default_delete<Context>{}};
}
Context::Context() :
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;
}
shared_ptr<Session> Context::create_session()
{
- return shared_ptr<Session>(
- new Session(shared_from_this()), Session::Deleter());
+ return shared_ptr<Session>{new Session{shared_from_this()},
+ default_delete<Session>{}};
}
shared_ptr<UserDevice> Context::create_user_device(
string vendor, string model, string version)
{
- return shared_ptr<UserDevice>(
- new UserDevice(vendor, model, version), UserDevice::Deleter());
+ return shared_ptr<UserDevice>{
+ new UserDevice{move(vendor), move(model), move(version)},
+ default_delete<UserDevice>{}};
}
shared_ptr<Packet> Context::create_header_packet(Glib::TimeVal start_time)
auto packet = g_new(struct sr_datafeed_packet, 1);
packet->type = SR_DF_HEADER;
packet->payload = header;
- return shared_ptr<Packet>(new Packet(nullptr, packet), Packet::Deleter());
+ return shared_ptr<Packet>{new Packet{nullptr, packet},
+ default_delete<Packet>{}};
}
shared_ptr<Packet> Context::create_meta_packet(
- const map<const ConfigKey *, Glib::VariantBase> &config)
+ map<const ConfigKey *, Glib::VariantBase> config)
{
auto meta = g_new0(struct sr_datafeed_meta, 1);
for (const auto &input : config)
auto packet = g_new(struct sr_datafeed_packet, 1);
packet->type = SR_DF_META;
packet->payload = meta;
- return shared_ptr<Packet>(new Packet(nullptr, packet), Packet::Deleter());
+ return shared_ptr<Packet>{new Packet{nullptr, packet},
+ default_delete<Packet>{}};
}
shared_ptr<Packet> Context::create_logic_packet(
auto packet = g_new(struct sr_datafeed_packet, 1);
packet->type = SR_DF_LOGIC;
packet->payload = logic;
- return shared_ptr<Packet>(new Packet(nullptr, packet), Packet::Deleter());
+ return shared_ptr<Packet>{new Packet{nullptr, packet}, default_delete<Packet>{}};
}
shared_ptr<Packet> Context::create_analog_packet(
- const vector<shared_ptr<Channel> > &channels,
+ vector<shared_ptr<Channel> > channels,
float *data_pointer, unsigned int num_samples, const Quantity *mq,
- const Unit *unit, const vector<const QuantityFlag *> &mqflags)
+ const Unit *unit, vector<const QuantityFlag *> mqflags)
{
auto analog = g_new0(struct sr_datafeed_analog, 1);
auto meaning = g_new0(struct sr_analog_meaning, 1);
+ auto encoding = g_new0(struct sr_analog_encoding, 1);
+ auto spec = g_new0(struct sr_analog_spec, 1);
analog->meaning = meaning;
for (const auto &channel : channels)
meaning->channels = g_slist_append(meaning->channels, channel->_structure);
- analog->num_samples = num_samples;
meaning->mq = static_cast<sr_mq>(mq->id());
meaning->unit = static_cast<sr_unit>(unit->id());
- meaning->mqflags = static_cast<sr_mqflag>(QuantityFlag::mask_from_flags(mqflags));
+ meaning->mqflags = static_cast<sr_mqflag>(QuantityFlag::mask_from_flags(move(mqflags)));
+
+ analog->encoding = encoding;
+
+ encoding->unitsize = sizeof(float);
+ encoding->is_signed = TRUE;
+ encoding->is_float = TRUE;
+#ifdef WORDS_BIGENDIAN
+ encoding->is_bigendian = TRUE;
+#else
+ encoding->is_bigendian = FALSE;
+#endif
+ encoding->digits = 0;
+ encoding->is_digits_decimal = FALSE;
+ encoding->scale.p = 1;
+ encoding->scale.q = 1;
+ encoding->offset.p = 0;
+ encoding->offset.q = 1;
+
+ analog->spec = spec;
+
+ spec->spec_digits = 0;
+
+ analog->num_samples = num_samples;
analog->data = data_pointer;
auto packet = g_new(struct sr_datafeed_packet, 1);
packet->type = SR_DF_ANALOG;
packet->payload = analog;
- return shared_ptr<Packet>(new Packet(nullptr, packet), Packet::Deleter());
+ return shared_ptr<Packet>{new Packet{nullptr, packet}, default_delete<Packet>{}};
}
shared_ptr<Session> Context::load_session(string filename)
{
- return shared_ptr<Session>(
- new Session(shared_from_this(), move(filename)), Session::Deleter());
+ return shared_ptr<Session>{
+ new Session{shared_from_this(), move(filename)},
+ default_delete<Session>{}};
}
shared_ptr<Trigger> Context::create_trigger(string name)
{
- return shared_ptr<Trigger>(
- new Trigger(shared_from_this(), move(name)), Trigger::Deleter());
+ return shared_ptr<Trigger>{
+ new Trigger{shared_from_this(), move(name)},
+ default_delete<Trigger>{}};
}
shared_ptr<Input> Context::open_file(string filename)
const struct sr_input *input;
check(sr_input_scan_file(filename.c_str(), &input));
- return shared_ptr<Input>(
- new Input(shared_from_this(), input), Input::Deleter());
+ return shared_ptr<Input>{
+ new Input{shared_from_this(), input},
+ default_delete<Input>{}};
}
shared_ptr<Input> Context::open_stream(string header)
auto ret = sr_input_scan_buffer(gstr, &input);
g_string_free(gstr, true);
check(ret);
- return shared_ptr<Input>(
- new Input(shared_from_this(), input), Input::Deleter());
+ return shared_ptr<Input>{
+ new Input{shared_from_this(), input},
+ default_delete<Input>{}};
}
map<string, string> Context::serials(shared_ptr<Driver> driver) 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;
+ if (opts) {
+ 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(
- const map<const ConfigKey *, Glib::VariantBase> &options)
+ map<const ConfigKey *, Glib::VariantBase> options)
{
/* Initialise the driver if not yet done. */
if (!_initialized)
for (GSList *device = device_list; device; device = device->next)
{
auto *const sdi = static_cast<struct sr_dev_inst *>(device->data);
- result.push_back(shared_ptr<HardwareDevice>(
- new HardwareDevice(shared_from_this(), sdi),
- HardwareDevice::Deleter()));
+ shared_ptr<HardwareDevice> hwdev {
+ new HardwareDevice{shared_from_this(), sdi},
+ default_delete<HardwareDevice>{}};
+ result.push_back(move(hwdev));
}
/* Free GSList returned from scan. */
{
}
+set<const ConfigKey *> Configurable::config_keys() const
+{
+ GArray *opts;
+ set<const ConfigKey *> result;
+
+ opts = sr_dev_options(config_driver, config_sdi, config_channel_group);
+
+ if (opts) {
+ 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
-{
- GVariant *data;
- check(sr_config_list(
- config_driver, config_sdi, config_channel_group,
- key->id(), &data));
- return Glib::VariantContainerBase(data);
-}
-
-map<const ConfigKey *, set<Capability>> Configurable::config_keys(const ConfigKey *key)
+set<const Capability *> Configurable::config_capabilities(const ConfigKey *key) const
{
- GVariant *gvar_opts;
- gsize num_opts;
- const uint32_t *opts;
- map<const ConfigKey *, set<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)));
+ int caps = sr_dev_config_capabilities_list(config_sdi,
+ config_channel_group, key->id());
- 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;
- }
+ set<const Capability *> result;
- 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)));
+ int caps = sr_dev_config_capabilities_list(config_sdi,
+ config_channel_group, key->id());
- for (gsize i = 0; i < num_opts; i++)
- {
- if ((opts[i] & SR_CONF_MASK) == unsigned(key->id()))
- {
- g_variant_unref(gvar_opts);
- return true;
- }
- }
-
- 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);
}
const struct sr_datafeed_packet *pkt)
{
auto device = _session->get_device(sdi);
- auto packet = shared_ptr<Packet>(new Packet(device, pkt), Packet::Deleter());
+ shared_ptr<Packet> packet {new Packet{device, pkt}, default_delete<Packet>{}};
_callback(move(device), move(packet));
}
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;
}
return result;
}
+unsigned int Analog::unitsize() const
+{
+ return _structure->encoding->unitsize;
+}
+
+bool Analog::is_signed() const
+{
+ return _structure->encoding->is_signed;
+}
+
+bool Analog::is_float() const
+{
+ return _structure->encoding->is_float;
+}
+
+bool Analog::is_bigendian() const
+{
+ return _structure->encoding->is_bigendian;
+}
+
+int Analog::digits() const
+{
+ return _structure->encoding->digits;
+}
+
+bool Analog::is_digits_decimal() const
+{
+ return _structure->encoding->is_digits_decimal;
+}
+
+shared_ptr<Rational> Analog::scale()
+{
+ unique_ptr<Rational> scale;
+ scale.reset(new Rational(&(_structure->encoding->scale)));
+
+ if (scale)
+ return scale->share_owned_by(shared_from_this());
+ else
+ throw Error(SR_ERR_NA);
+}
+
+shared_ptr<Rational> Analog::offset()
+{
+ unique_ptr<Rational> offset;
+ offset.reset(new Rational(&(_structure->encoding->offset)));
+
+ if (offset)
+ return offset->share_owned_by(shared_from_this());
+ else
+ throw Error(SR_ERR_NA);
+}
+
const Quantity *Analog::mq() const
{
return Quantity::get(_structure->meaning->mq);
return QuantityFlag::flags_from_mask(_structure->meaning->mqflags);
}
+Rational::Rational(const struct sr_rational *structure) :
+ _structure(structure)
+{
+}
+
+Rational::~Rational()
+{
+}
+
+shared_ptr<Rational> Rational::share_owned_by(shared_ptr<Analog> _parent)
+{
+ return static_pointer_cast<Rational>(
+ ParentOwned::share_owned_by(_parent));
+}
+
+int64_t Rational::numerator() const
+{
+ return _structure->p;
+}
+
+uint64_t Rational::denominator() const
+{
+ return _structure->q;
+}
+
+float Rational::value() const
+{
+ return (float)(_structure->p) / (float)(_structure->q);
+}
+
InputFormat::InputFormat(const struct sr_input_module *structure) :
_structure(structure)
{
map<string, shared_ptr<Option>> InputFormat::options()
{
- const struct sr_option **options = sr_input_options_get(_structure);
map<string, shared_ptr<Option>> result;
- if (options)
+
+ if (const struct sr_option **options = sr_input_options_get(_structure))
{
- auto option_array = shared_ptr<const struct sr_option *>(
- options, sr_input_options_free);
- for (int i = 0; options[i]; i++)
- result[options[i]->id] = shared_ptr<Option>(
- new Option(options[i], option_array), Option::Deleter());
+ shared_ptr<const struct sr_option *> option_array
+ {options, &sr_input_options_free};
+ for (int i = 0; options[i]; i++) {
+ shared_ptr<Option> opt {
+ new Option{options[i], option_array},
+ default_delete<Option>{}};
+ result.insert({opt->id(), move(opt)});
+ }
}
return result;
}
shared_ptr<Input> InputFormat::create_input(
- const map<string, Glib::VariantBase> &options)
+ map<string, Glib::VariantBase> options)
{
auto input = sr_input_new(_structure, map_to_hash_variant(options));
if (!input)
throw Error(SR_ERR_ARG);
- return shared_ptr<Input>(new Input(_parent, input), Input::Deleter());
+ return shared_ptr<Input>{new Input{_parent, input}, default_delete<Input>{}};
}
Input::Input(shared_ptr<Context> context, const struct sr_input *structure) :
check(sr_input_end(_structure));
}
+void Input::reset()
+{
+ check(sr_input_reset(_structure));
+}
+
Input::~Input()
{
sr_input_free(_structure);
map<string, shared_ptr<Option>> OutputFormat::options()
{
- const struct sr_option **options = sr_output_options_get(_structure);
map<string, shared_ptr<Option>> result;
- if (options)
+
+ if (const struct sr_option **options = sr_output_options_get(_structure))
{
- auto option_array = shared_ptr<const struct sr_option *>(
- options, sr_output_options_free);
- for (int i = 0; options[i]; i++)
- result[options[i]->id] = shared_ptr<Option>(
- new Option(options[i], option_array), Option::Deleter());
+ shared_ptr<const struct sr_option *> option_array
+ {options, &sr_output_options_free};
+ for (int i = 0; options[i]; i++) {
+ shared_ptr<Option> opt {
+ new Option{options[i], option_array},
+ default_delete<Option>{}};
+ result.insert({opt->id(), move(opt)});
+ }
}
return result;
}
shared_ptr<Output> OutputFormat::create_output(
- shared_ptr<Device> device, const map<string, Glib::VariantBase> &options)
+ shared_ptr<Device> device, map<string, Glib::VariantBase> options)
{
- return shared_ptr<Output>(
- new Output(shared_from_this(), move(device), options),
- Output::Deleter());
+ return shared_ptr<Output>{
+ new Output{shared_from_this(), move(device), move(options)},
+ default_delete<Output>{}};
}
shared_ptr<Output> OutputFormat::create_output(string filename,
- shared_ptr<Device> device, const map<string, Glib::VariantBase> &options)
+ shared_ptr<Device> device, map<string, Glib::VariantBase> options)
{
- return shared_ptr<Output>(
- new Output(move(filename), shared_from_this(), move(device), options),
- Output::Deleter());
+ return shared_ptr<Output>{
+ new Output{move(filename), shared_from_this(), move(device), move(options)},
+ default_delete<Output>{}};
}
bool OutputFormat::test_flag(const OutputFlag *flag) const
}
Output::Output(shared_ptr<OutputFormat> format,
- shared_ptr<Device> device, const map<string, Glib::VariantBase> &options) :
+ shared_ptr<Device> device, map<string, Glib::VariantBase> options) :
_structure(sr_output_new(format->_structure,
map_to_hash_variant(options), device->_structure, nullptr)),
_format(move(format)),
_device(move(device)),
- _options(options)
+ _options(move(options))
{
}
Output::Output(string filename, shared_ptr<OutputFormat> format,
- shared_ptr<Device> device, const map<string, Glib::VariantBase> &options) :
+ shared_ptr<Device> device, map<string, Glib::VariantBase> options) :
_structure(sr_output_new(format->_structure,
map_to_hash_variant(options), device->_structure, filename.c_str())),
_format(move(format)),
_device(move(device)),
- _options(options)
+ _options(move(options))
{
}
projects / libsigrok.git / blobdiff