Driver::~Driver()
{
- for (auto device : _devices)
- delete device;
}
string Driver::name()
_initialized = true;
}
- /* Clear all existing instances. */
- for (auto device : _devices)
- delete device;
- _devices.clear();
-
/* Translate scan options to GSList of struct sr_config pointers. */
GSList *option_list = NULL;
for (auto entry : options)
/* Free option list. */
g_slist_free_full(option_list, g_free);
+
/* Create device objects. */
+ vector<shared_ptr<HardwareDevice>> result;
for (GSList *device = device_list; device; device = device->next)
{
auto sdi = (struct sr_dev_inst *) device->data;
- _devices.push_back(new HardwareDevice(this, sdi));
+ result.push_back(shared_ptr<HardwareDevice>(
+ new HardwareDevice(shared_from_this(), sdi),
+ HardwareDevice::Deleter()));
}
/* Free GSList returned from scan. */
g_slist_free(device_list);
- /* Create list of shared pointers to device instances for return. */
- vector<shared_ptr<HardwareDevice>> result;
- for (auto device : _devices)
- result.push_back(device->get_shared_pointer(_parent));
return result;
}
return Glib::VariantContainerBase(data);
}
-vector<const ConfigKey *> Configurable::config_keys(const ConfigKey *key)
+map<const ConfigKey *, set<Capability>> Configurable::config_keys(const ConfigKey *key)
{
GVariant *gvar_opts;
gsize num_opts;
- const int32_t *opts;
- vector<const ConfigKey *> result;
+ 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 = (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]));
+ {
+ 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);
{
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;
ostringstream s;
vector<string> parts =
- {vendor(), model(), version()};
+ {vendor(), model(), version(), serial_number()};
+
+ for (size_t i = 0; i < parts.size(); i++)
+ {
+ if (parts[i].length() > 0)
+ {
+ if (i != 0)
+ s << " ";
+ s << parts[i];
+ }
+ }
- for (string part : parts)
- if (part.length() > 0)
- s << part;
+ if (serial_number().length() == 0 && connection_id().length() > 0)
+ s << " " << connection_id();
return s.str();
}
return valid_string(_structure->version);
}
+string Device::serial_number()
+{
+ return valid_string(_structure->serial_num);
+}
+
+string Device::connection_id()
+{
+ return valid_string(_structure->connection_id);
+}
+
vector<shared_ptr<Channel>> Device::channels()
{
vector<shared_ptr<Channel>> result;
check(sr_dev_close(_structure));
}
-HardwareDevice::HardwareDevice(Driver *driver, struct sr_dev_inst *structure) :
- ParentOwned(structure),
+HardwareDevice::HardwareDevice(shared_ptr<Driver> driver,
+ struct sr_dev_inst *structure) :
+ UserOwned(structure),
Device(structure),
_driver(driver)
{
shared_ptr<Driver> HardwareDevice::driver()
{
- return _driver->get_shared_pointer(_parent);
+ return _driver;
}
Channel::Channel(struct sr_channel *structure) :
void DatafeedCallbackData::run(const struct sr_dev_inst *sdi,
const struct sr_datafeed_packet *pkt)
{
- auto device = _session->_devices[sdi];
+ auto device = _session->get_device(sdi);
auto packet = shared_ptr<Packet>(new Packet(device, pkt), Packet::Deleter());
_callback(device, packet);
}
{
}
+string SessionDevice::description()
+{
+ return _parent->_filename;
+}
+
shared_ptr<Device> SessionDevice::get_shared_from_this()
{
return static_pointer_cast<Device>(shared_from_this());
Session::Session(shared_ptr<Context> context, string filename) :
UserOwned(_structure),
_context(context),
+ _filename(filename),
_saving(false)
{
check(sr_session_load(filename.c_str(), &_structure));
for (GSList *dev = dev_list; dev; dev = dev->next)
{
auto sdi = (struct sr_dev_inst *) dev->data;
- auto device = new SessionDevice(sdi);
- _devices[sdi] = shared_ptr<SessionDevice>(device,
- SessionDevice::Deleter());
+ _owned_devices[sdi] = new SessionDevice(sdi);
}
_context->_session = this;
}
for (auto entry : _source_callbacks)
delete entry.second;
+
+ for (auto entry : _owned_devices)
+ delete entry.second;
+}
+
+shared_ptr<Device> Session::get_device(const struct sr_dev_inst *sdi)
+{
+ if (_owned_devices.count(sdi))
+ return static_pointer_cast<Device>(
+ _owned_devices[sdi]->get_shared_pointer(this));
+ else if (_other_devices.count(sdi))
+ return _other_devices[sdi];
+ else
+ throw Error(SR_ERR_BUG);
}
void Session::add_device(shared_ptr<Device> device)
{
check(sr_session_dev_add(_structure, device->_structure));
- _devices[device->_structure] = device;
+ _other_devices[device->_structure] = device;
}
vector<shared_ptr<Device>> Session::devices()
for (GSList *dev = dev_list; dev; dev = dev->next)
{
auto sdi = (struct sr_dev_inst *) dev->data;
- result.push_back(_devices[sdi]);
+ result.push_back(get_device(sdi));
}
return result;
}
void Session::remove_devices()
{
- _devices.clear();
+ for (auto entry : _owned_devices)
+ {
+ // We own this device. Make sure it's not referenced.
+ auto device = entry.second;
+ auto ptr = device->get_shared_pointer(this);
+ if (ptr.use_count() > 1)
+ throw Error(SR_ERR_BUG);
+ delete device;
+ }
+ _owned_devices.clear();
+ _other_devices.clear();
check(sr_session_dev_remove_all(_structure));
}
check(ret);
}
+void Input::end()
+{
+ check(sr_input_end(_structure));
+}
+
Input::~Input()
{
if (_device)
delete _device;
- check(sr_input_free(_structure));
+ sr_input_free(_structure);
}
InputDevice::InputDevice(shared_ptr<Input> input,
{
}
+string InputDevice::description()
+{
+ return "<input data>";
+}
+
shared_ptr<Device> InputDevice::get_shared_from_this()
{
return static_pointer_cast<Device>(shared_from_this());