X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdevicemanager.cpp;h=36d6fb6a44f1d0c10ae05a234503e5347122a85c;hb=da30ecb7e72bd2547e524258efa5ec642988b70b;hp=13b44e969cc2720e0d17f86c9ab4871030221f06;hpb=6842b5fc481eb43d9aeea81f17e211820d6dc405;p=pulseview.git diff --git a/pv/devicemanager.cpp b/pv/devicemanager.cpp index 13b44e9..36d6fb6 100644 --- a/pv/devicemanager.cpp +++ b/pv/devicemanager.cpp @@ -18,88 +18,135 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "devicemanager.h" -#include "device/device.h" -#include "sigsession.h" +#include "devicemanager.hpp" +#include "session.hpp" #include #include +#include #include +#include -#include +#include +#include +#include + +#include + +using boost::algorithm::join; + +using std::dynamic_pointer_cast; using std::list; using std::map; +using std::remove_if; using std::runtime_error; using std::shared_ptr; using std::string; +using std::vector; + +using Glib::VariantBase; + +using sigrok::ConfigKey; +using sigrok::Context; +using sigrok::Driver; +using sigrok::SessionDevice; namespace pv { -DeviceManager::DeviceManager(struct sr_context *sr_ctx) : - _sr_ctx(sr_ctx) +DeviceManager::DeviceManager(shared_ptr context) : + context_(context) { - init_drivers(); - scan_all_drivers(); + for (auto entry : context->drivers()) + driver_scan(entry.second, map()); } DeviceManager::~DeviceManager() { - release_devices(); } -const list< shared_ptr >& DeviceManager::devices() const +const std::shared_ptr& DeviceManager::context() const { - return _devices; + return context_; } -list< shared_ptr > DeviceManager::driver_scan( - struct sr_dev_driver *const driver, GSList *const drvopts) +shared_ptr DeviceManager::context() { - list< shared_ptr > driver_devices; + return context_; +} + +const list< shared_ptr >& +DeviceManager::devices() const +{ + return devices_; +} + +list< shared_ptr > +DeviceManager::driver_scan( + shared_ptr driver, map drvopts) +{ + list< shared_ptr > driver_devices; assert(driver); // Remove any device instances from this driver from the device // list. They will not be valid after the scan. - auto i = _devices.begin(); - while (i != _devices.end()) { - if ((*i)->dev_inst()->driver == driver) - i = _devices.erase(i); - else - i++; + devices_.remove_if([&](shared_ptr device) { + return device->hardware_device()->driver() == driver; }); + + // Do the scan + auto devices = driver->scan(drvopts); + + // Add the scanned devices to the main list, set display names and sort. + for (shared_ptr device : devices) { + const shared_ptr d( + new devices::HardwareDevice(context_, device)); + driver_devices.push_back(d); } - // Release this driver and all it's attached devices - release_driver(driver); + for (shared_ptr device : driver_devices) + build_display_name(device); - // Do the scan - GSList *const devices = sr_driver_scan(driver, drvopts); - for (GSList *l = devices; l; l = l->next) - driver_devices.push_back(shared_ptr( - new device::Device((sr_dev_inst*)l->data))); - g_slist_free(devices); - driver_devices.sort(compare_devices); - - // Add the scanned devices to the main list - _devices.insert(_devices.end(), driver_devices.begin(), + devices_.insert(devices_.end(), driver_devices.begin(), driver_devices.end()); - _devices.sort(compare_devices); + devices_.sort([&](shared_ptr a, + shared_ptr b) + { return compare_devices(a, b); }); return driver_devices; } -const shared_ptr DeviceManager::find_device_from_info( +const map DeviceManager::get_device_info( + shared_ptr device) +{ + map result; + + assert(device); + + const shared_ptr sr_dev = device->device(); + if (sr_dev->vendor().length() > 0) + result["vendor"] = sr_dev->vendor(); + if (sr_dev->model().length() > 0) + result["model"] = sr_dev->model(); + if (sr_dev->version().length() > 0) + result["version"] = sr_dev->version(); + if (sr_dev->serial_number().length() > 0) + result["serial_num"] = sr_dev->serial_number(); + if (sr_dev->connection_id().length() > 0) + result["connection_id"] = sr_dev->connection_id(); + + return result; +} + +const shared_ptr DeviceManager::find_device_from_info( const map search_info) { - shared_ptr last_resort_dev; + shared_ptr last_resort_dev; map dev_info; - last_resort_dev = NULL; - - for (shared_ptr dev : _devices) { + for (shared_ptr dev : devices_) { assert(dev); - dev_info = dev->get_device_info(); + dev_info = get_device_info(dev); // If present, vendor and model always have to match. if (dev_info.count("vendor") > 0 && search_info.count("vendor") > 0) @@ -140,59 +187,80 @@ const shared_ptr DeviceManager::find_device_from_info( return last_resort_dev; } -void DeviceManager::init_drivers() +void DeviceManager::build_display_name(shared_ptr device) { - // Initialise all libsigrok drivers - sr_dev_driver **const drivers = sr_driver_list(); - for (sr_dev_driver **driver = drivers; *driver; driver++) { - if (sr_driver_init(_sr_ctx, *driver) != SR_OK) { - throw runtime_error( - string("Failed to initialize driver ") + - string((*driver)->name)); - } + const shared_ptr sr_dev = device->device(); + auto session_device = dynamic_pointer_cast(sr_dev); + auto hardware_device = dynamic_pointer_cast(sr_dev); + + if (session_device) { + full_names_[device] = display_names_[device] = + boost::filesystem::path( + session_device->parent()->filename()).filename().string(); + return; } -} -void DeviceManager::release_devices() -{ - // Release all the used devices - for (shared_ptr dev : _devices) { - assert(dev); - dev->release(); + // First, build the device's full name. It always contains all + // possible information. + vector parts = {sr_dev->vendor(), sr_dev->model(), + sr_dev->version(), sr_dev->serial_number()}; + + if (sr_dev->connection_id().length() > 0) + parts.push_back("("+sr_dev->connection_id()+")"); + + full_names_[device] = join(parts, " "); + + // Next, build the display name. It only contains fields as required. + + // If we can find another device with the same model/vendor then + // we have at least two such devices and need to distinguish them. + const bool multiple_dev = hardware_device && any_of( + devices_.begin(), devices_.end(), + [&](shared_ptr dev) { + return (dev->device()->vendor() == hardware_device->vendor() && + dev->device()->model() == hardware_device->model()) && + dev != device; + } ); + + parts = {sr_dev->vendor(), sr_dev->model()}; + + if (multiple_dev) { + parts.push_back(sr_dev->version()); + parts.push_back(sr_dev->serial_number()); + + if ((sr_dev->serial_number().length() == 0) && + (sr_dev->connection_id().length() > 0)) + parts.push_back("("+sr_dev->connection_id()+")"); } - // Clear all the drivers - sr_dev_driver **const drivers = sr_driver_list(); - for (sr_dev_driver **driver = drivers; *driver; driver++) - sr_dev_clear(*driver); + display_names_[device] = join(parts, " "); } -void DeviceManager::scan_all_drivers() +const std::string DeviceManager::get_display_name( + std::shared_ptr dev) { - // Scan all drivers for all devices. - struct sr_dev_driver **const drivers = sr_driver_list(); - for (struct sr_dev_driver **driver = drivers; *driver; driver++) - driver_scan(*driver); + return display_names_[dev]; } -void DeviceManager::release_driver(struct sr_dev_driver *const driver) +const std::string DeviceManager::get_full_name( + std::shared_ptr dev) { - for (shared_ptr dev : _devices) { - assert(dev); - if(dev->dev_inst()->driver == driver) - dev->release(); - } + return full_names_[dev]; +} - // Clear all the old device instances from this driver - sr_dev_clear(driver); +void DeviceManager::update_display_name( + std::shared_ptr dev) +{ + build_display_name(dev); } -bool DeviceManager::compare_devices(shared_ptr a, - shared_ptr b) +bool DeviceManager::compare_devices( + shared_ptr a, shared_ptr b) { assert(a); assert(b); - return a->format_device_title().compare(b->format_device_title()) < 0; + + return display_names_[a].compare(display_names_[b]) < 0; } } // namespace pv