X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=bindings%2Fcxx%2Fclasses.cpp;h=5c0ae3d0a0fc7ccbdc3756f49aaa511cdfa6d45c;hb=0cee3a3ea5d9808c000def569887e5f18b82df71;hp=5a977a86bf0fcf0d0856e615422f0e72c755c2af;hpb=f17b45465500f1d1aad58479802018949004cce5;p=libsigrok.git diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp index 5a977a86..5c0ae3d0 100644 --- a/bindings/cxx/classes.cpp +++ b/bindings/cxx/classes.cpp @@ -101,7 +101,7 @@ SR_PRIV int ResourceReader::close_callback(struct sr_resource *res, 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 { @@ -116,7 +116,7 @@ SR_PRIV ssize_t ResourceReader::read_callback(const struct sr_resource *res, shared_ptr Context::create() { - return shared_ptr(new Context(), Context::Deleter()); + return shared_ptr{new Context{}, default_delete{}}; } Context::Context() : @@ -128,19 +128,19 @@ Context::Context() : if (struct sr_dev_driver **driver_list = sr_driver_list(_structure)) for (int i = 0; driver_list[i]; i++) { unique_ptr 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 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 output {new OutputFormat{output_list[i]}}; - _output_formats.emplace(output->name(), move(output)); + _output_formats.insert(make_pair(output->name(), move(output))); } } @@ -161,7 +161,7 @@ map> Context::drivers() { 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; } @@ -173,7 +173,7 @@ map> Context::input_formats() { 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; } @@ -185,7 +185,7 @@ map> Context::output_formats() { 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; } @@ -252,15 +252,16 @@ void Context::set_resource_reader(ResourceReader *reader) shared_ptr Context::create_session() { - return shared_ptr( - new Session(shared_from_this()), Session::Deleter()); + return shared_ptr{new Session{shared_from_this()}, + default_delete{}}; } shared_ptr Context::create_user_device( string vendor, string model, string version) { - return shared_ptr( - new UserDevice(vendor, model, version), UserDevice::Deleter()); + return shared_ptr{ + new UserDevice{move(vendor), move(model), move(version)}, + default_delete{}}; } shared_ptr Context::create_header_packet(Glib::TimeVal start_time) @@ -272,11 +273,12 @@ shared_ptr 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(new Packet(nullptr, packet), Packet::Deleter()); + return shared_ptr{new Packet{nullptr, packet}, + default_delete{}}; } shared_ptr Context::create_meta_packet( - const map &config) + map config) { auto meta = g_new0(struct sr_datafeed_meta, 1); for (const auto &input : config) @@ -291,7 +293,8 @@ shared_ptr Context::create_meta_packet( auto packet = g_new(struct sr_datafeed_packet, 1); packet->type = SR_DF_META; packet->payload = meta; - return shared_ptr(new Packet(nullptr, packet), Packet::Deleter()); + return shared_ptr{new Packet{nullptr, packet}, + default_delete{}}; } shared_ptr Context::create_logic_packet( @@ -304,42 +307,68 @@ shared_ptr Context::create_logic_packet( auto packet = g_new(struct sr_datafeed_packet, 1); packet->type = SR_DF_LOGIC; packet->payload = logic; - return shared_ptr(new Packet(nullptr, packet), Packet::Deleter()); + return shared_ptr{new Packet{nullptr, packet}, default_delete{}}; } shared_ptr Context::create_analog_packet( - const vector > &channels, + vector > channels, float *data_pointer, unsigned int num_samples, const Quantity *mq, - const Unit *unit, const vector &mqflags) + const Unit *unit, vector 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(mq->id()); meaning->unit = static_cast(unit->id()); - meaning->mqflags = static_cast(QuantityFlag::mask_from_flags(mqflags)); + meaning->mqflags = static_cast(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(new Packet(nullptr, packet), Packet::Deleter()); + return shared_ptr{new Packet{nullptr, packet}, default_delete{}}; } shared_ptr Context::load_session(string filename) { - return shared_ptr( - new Session(shared_from_this(), move(filename)), Session::Deleter()); + return shared_ptr{ + new Session{shared_from_this(), move(filename)}, + default_delete{}}; } shared_ptr Context::create_trigger(string name) { - return shared_ptr( - new Trigger(shared_from_this(), move(name)), Trigger::Deleter()); + return shared_ptr{ + new Trigger{shared_from_this(), move(name)}, + default_delete{}}; } shared_ptr Context::open_file(string filename) @@ -347,8 +376,9 @@ shared_ptr Context::open_file(string filename) const struct sr_input *input; check(sr_input_scan_file(filename.c_str(), &input)); - return shared_ptr( - new Input(shared_from_this(), input), Input::Deleter()); + return shared_ptr{ + new Input{shared_from_this(), input}, + default_delete{}}; } shared_ptr Context::open_stream(string header) @@ -359,8 +389,9 @@ shared_ptr Context::open_stream(string header) auto ret = sr_input_scan_buffer(gstr, &input); g_string_free(gstr, true); check(ret); - return shared_ptr( - new Input(shared_from_this(), input), Input::Deleter()); + return shared_ptr{ + new Input{shared_from_this(), input}, + default_delete{}}; } map Context::serials(shared_ptr driver) const @@ -399,8 +430,20 @@ string Driver::long_name() const return valid_string(_structure->longname); } +set Driver::scan_options() const +{ + GArray *opts = sr_driver_scan_options_list(_structure); + set 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> Driver::scan( - const map &options) + map options) { /* Initialise the driver if not yet done. */ if (!_initialized) @@ -433,9 +476,10 @@ vector> Driver::scan( for (GSList *device = device_list; device; device = device->next) { auto *const sdi = static_cast(device->data); - result.push_back(shared_ptr( - new HardwareDevice(shared_from_this(), sdi), - HardwareDevice::Deleter())); + shared_ptr hwdev { + new HardwareDevice{shared_from_this(), sdi}, + default_delete{}}; + result.push_back(move(hwdev)); } /* Free GSList returned from scan. */ @@ -458,6 +502,22 @@ Configurable::~Configurable() { } +set Configurable::config_keys() const +{ + GArray *opts; + set 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; @@ -474,73 +534,36 @@ void Configurable::config_set(const ConfigKey *key, const Glib::VariantBase &val key->id(), const_cast(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> Configurable::config_keys(const ConfigKey *key) +set Configurable::config_capabilities(const ConfigKey *key) const { - GVariant *gvar_opts; - gsize num_opts; - const uint32_t *opts; - map> result; - - check(sr_config_list( - config_driver, config_sdi, config_channel_group, - key->id(), &gvar_opts)); - - opts = static_cast(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 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 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(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) : @@ -551,14 +574,14 @@ Device::Device(struct sr_dev_inst *structure) : { auto *const ch = static_cast(entry->data); unique_ptr 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(entry->data); unique_ptr group {new ChannelGroup{this, cg}}; - _channel_groups.emplace(group->name(), move(group)); + _channel_groups.insert(make_pair(group->name(), move(group))); } } @@ -613,7 +636,7 @@ Device::channel_groups() { 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; } @@ -672,7 +695,7 @@ shared_ptr UserDevice::add_channel(unsigned int index, GSList *const last = g_slist_last(sr_dev_inst_channels_get(Device::_structure)); auto *const ch = static_cast(last->data); unique_ptr channel {new Channel{ch}}; - _channels.emplace(ch, move(channel)); + _channels.insert(make_pair(ch, move(channel))); return get_channel(ch); } @@ -858,7 +881,7 @@ void DatafeedCallbackData::run(const struct sr_dev_inst *sdi, const struct sr_datafeed_packet *pkt) { auto device = _session->get_device(sdi); - auto packet = shared_ptr(new Packet(device, pkt), Packet::Deleter()); + shared_ptr packet {new Packet{device, pkt}, default_delete{}}; _callback(move(device), move(packet)); } @@ -895,7 +918,7 @@ Session::Session(shared_ptr context, string filename) : for (GSList *dev = dev_list; dev; dev = dev->next) { auto *const sdi = static_cast(dev->data); unique_ptr device {new SessionDevice{sdi}}; - _owned_devices.emplace(sdi, move(device)); + _owned_devices.insert(make_pair(sdi, move(device))); } _context->_session = this; } @@ -1132,7 +1155,7 @@ map Meta::config() const map result; for (auto l = _structure->config; l; l = l->next) { auto *const config = static_cast(l->data); - result[ConfigKey::get(config->key)] = Glib::VariantBase(config->data); + result[ConfigKey::get(config->key)] = Glib::VariantBase(config->data, true); } return result; } @@ -1204,6 +1227,58 @@ vector> Analog::channels() 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 Analog::scale() +{ + unique_ptr 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 Analog::offset() +{ + unique_ptr 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); @@ -1219,6 +1294,36 @@ vector Analog::mq_flags() const return QuantityFlag::flags_from_mask(_structure->meaning->mqflags); } +Rational::Rational(const struct sr_rational *structure) : + _structure(structure) +{ +} + +Rational::~Rational() +{ +} + +shared_ptr Rational::share_owned_by(shared_ptr _parent) +{ + return static_pointer_cast( + 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) { @@ -1249,26 +1354,29 @@ vector InputFormat::extensions() const map> InputFormat::options() { - const struct sr_option **options = sr_input_options_get(_structure); map> result; - if (options) + + if (const struct sr_option **options = sr_input_options_get(_structure)) { - auto option_array = shared_ptr( - options, sr_input_options_free); - for (int i = 0; options[i]; i++) - result[options[i]->id] = shared_ptr