X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdevicemanager.cpp;h=13b44e969cc2720e0d17f86c9ab4871030221f06;hb=6842b5fc481eb43d9aeea81f17e211820d6dc405;hp=14ad16efcad67abb72f844cafd7c108f10c8d9bf;hpb=819f4c25391a9c74d3d2f528d462142d5c4aad4d;p=pulseview.git diff --git a/pv/devicemanager.cpp b/pv/devicemanager.cpp index 14ad16e..13b44e9 100644 --- a/pv/devicemanager.cpp +++ b/pv/devicemanager.cpp @@ -19,10 +19,10 @@ */ #include "devicemanager.h" +#include "device/device.h" #include "sigsession.h" #include -#include #include #include @@ -30,8 +30,8 @@ using std::list; using std::map; -using std::ostringstream; using std::runtime_error; +using std::shared_ptr; using std::string; namespace pv { @@ -48,44 +48,23 @@ DeviceManager::~DeviceManager() release_devices(); } -const std::list& DeviceManager::devices() const +const list< shared_ptr >& DeviceManager::devices() const { return _devices; } -void DeviceManager::use_device(sr_dev_inst *sdi, SigSession *owner) -{ - assert(sdi); - assert(owner); - - _used_devices[sdi] = owner; - - sr_dev_open(sdi); -} - -void DeviceManager::release_device(sr_dev_inst *sdi) -{ - assert(sdi); - - // Notify the owner, and removed the device from the used device list - _used_devices[sdi]->release_device(sdi); - _used_devices.erase(sdi); - - sr_dev_close(sdi); -} - -list DeviceManager::driver_scan( +list< shared_ptr > DeviceManager::driver_scan( struct sr_dev_driver *const driver, GSList *const drvopts) { - list driver_devices; + 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. - list::iterator i = _devices.begin(); + auto i = _devices.begin(); while (i != _devices.end()) { - if ((*i)->driver == driver) + if ((*i)->dev_inst()->driver == driver) i = _devices.erase(i); else i++; @@ -97,7 +76,8 @@ list DeviceManager::driver_scan( // Do the scan GSList *const devices = sr_driver_scan(driver, drvopts); for (GSList *l = devices; l; l = l->next) - driver_devices.push_back((sr_dev_inst*)l->data); + driver_devices.push_back(shared_ptr( + new device::Device((sr_dev_inst*)l->data))); g_slist_free(devices); driver_devices.sort(compare_devices); @@ -109,29 +89,55 @@ list DeviceManager::driver_scan( return driver_devices; } -string DeviceManager::format_device_title(const sr_dev_inst *const sdi) +const shared_ptr DeviceManager::find_device_from_info( + const map search_info) { - ostringstream s; - - assert(sdi); - - if (sdi->vendor && sdi->vendor[0]) { - s << sdi->vendor; - if ((sdi->model && sdi->model[0]) || - (sdi->version && sdi->version[0])) - s << ' '; + shared_ptr last_resort_dev; + map dev_info; + + last_resort_dev = NULL; + + for (shared_ptr dev : _devices) { + assert(dev); + dev_info = dev->get_device_info(); + + // If present, vendor and model always have to match. + if (dev_info.count("vendor") > 0 && search_info.count("vendor") > 0) + if (dev_info.at("vendor") != search_info.at("vendor")) continue; + + if (dev_info.count("model") > 0 && search_info.count("model") > 0) + if (dev_info.at("model") != search_info.at("model")) continue; + + // Most unique match: vendor/model/serial_num (but don't match a S/N of 0) + if ((dev_info.count("serial_num") > 0) && (dev_info.at("serial_num") != "0") + && search_info.count("serial_num") > 0) + if (dev_info.at("serial_num") == search_info.at("serial_num") && + dev_info.at("serial_num") != "0") + return dev; + + // Second best match: vendor/model/connection_id + if (dev_info.count("connection_id") > 0 && + search_info.count("connection_id") > 0) + if (dev_info.at("connection_id") == search_info.at("connection_id")) + return dev; + + // Last resort: vendor/model/version + if (dev_info.count("version") > 0 && + search_info.count("version") > 0) + if (dev_info.at("version") == search_info.at("version") && + dev_info.at("version") != "0") + return dev; + + // For this device, we merely have a vendor/model match. + last_resort_dev = dev; } - if (sdi->model && sdi->model[0]) { - s << sdi->model; - if (sdi->version && sdi->version[0]) - s << ' '; - } - - if (sdi->version && sdi->version[0]) - s << sdi->version; - - return s.str(); + // If there wasn't even a vendor/model/version match, we end up here. + // This is usually the case for devices with only vendor/model data. + // The selected device may be wrong with multiple such devices attached + // but it is the best we can do at this point. After all, there may be + // only one such device and we do want to select it in this case. + return last_resort_dev; } void DeviceManager::init_drivers() @@ -150,11 +156,10 @@ void DeviceManager::init_drivers() void DeviceManager::release_devices() { // Release all the used devices - for (map::iterator i = _used_devices.begin(); - i != _used_devices.end(); i++) - release_device((*i).first); - - _used_devices.clear(); + for (shared_ptr dev : _devices) { + assert(dev); + dev->release(); + } // Clear all the drivers sr_dev_driver **const drivers = sr_driver_list(); @@ -172,29 +177,22 @@ void DeviceManager::scan_all_drivers() void DeviceManager::release_driver(struct sr_dev_driver *const driver) { - assert(driver); - for (map::iterator i = _used_devices.begin(); - i != _used_devices.end(); i++) - if((*i).first->driver == driver) - { - // Notify the current owner of the device - (*i).second->release_device((*i).first); - - // Remove it from the used device list - _used_devices.erase(i); - - // Close the device instance - sr_dev_close((*i).first); - } + for (shared_ptr dev : _devices) { + assert(dev); + if(dev->dev_inst()->driver == driver) + dev->release(); + } // Clear all the old device instances from this driver sr_dev_clear(driver); } -bool DeviceManager::compare_devices(const sr_dev_inst *const a, - const sr_dev_inst *const b) +bool DeviceManager::compare_devices(shared_ptr a, + shared_ptr b) { - return format_device_title(a).compare(format_device_title(b)) < 0; + assert(a); + assert(b); + return a->format_device_title().compare(b->format_device_title()) < 0; } } // namespace pv