*/
#include "devicemanager.h"
-#include "device/devinst.h"
+#include "device/device.h"
#include "sigsession.h"
#include <cassert>
#include <libsigrok/libsigrok.h>
-using boost::shared_ptr;
using std::list;
using std::map;
-using std::ostringstream;
using std::runtime_error;
+using std::shared_ptr;
using std::string;
namespace pv {
release_devices();
}
-const list< shared_ptr<pv::device::DevInst> >& DeviceManager::devices() const
+const list< shared_ptr<pv::device::Device> >& DeviceManager::devices() const
{
return _devices;
}
-void DeviceManager::use_device(shared_ptr<device::DevInst> dev_inst,
- SigSession *owner)
-{
- assert(dev_inst);
- assert(owner);
-
- _used_devices[dev_inst] = owner;
-
- sr_dev_open(dev_inst->dev_inst());
-}
-
-void DeviceManager::release_device(shared_ptr<device::DevInst> dev_inst)
-{
- assert(dev_inst);
-
- // Notify the owner, and remove the device from the used device list
- map< shared_ptr<device::DevInst>, pv::SigSession*>::const_iterator
- iter = _used_devices.find(dev_inst);
- assert(iter != _used_devices.end());
-
- (*iter).second->release_device(dev_inst);
- _used_devices.erase(dev_inst);
-}
-
-list< shared_ptr<device::DevInst> > DeviceManager::driver_scan(
+list< shared_ptr<device::Device> > DeviceManager::driver_scan(
struct sr_dev_driver *const driver, GSList *const drvopts)
{
- list< shared_ptr<device::DevInst> > driver_devices;
+ list< shared_ptr<device::Device> > driver_devices;
assert(driver);
// Remove any device instances from this driver from the device
// list. They will not be valid after the scan.
- list< shared_ptr<device::DevInst> >::iterator i = _devices.begin();
+ auto i = _devices.begin();
while (i != _devices.end()) {
if ((*i)->dev_inst()->driver == driver)
i = _devices.erase(i);
// 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<device::DevInst>(
- new device::DevInst((sr_dev_inst*)l->data)));
+ driver_devices.push_back(shared_ptr<device::Device>(
+ new device::Device((sr_dev_inst*)l->data)));
g_slist_free(devices);
driver_devices.sort(compare_devices);
return driver_devices;
}
+const shared_ptr<device::Device> DeviceManager::find_device_from_info(
+ const map<string, string> search_info)
+{
+ shared_ptr<device::Device> last_resort_dev;
+ map<string, string> dev_info;
+
+ last_resort_dev = NULL;
+
+ for (shared_ptr<device::Device> 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 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()
{
// Initialise all libsigrok drivers
void DeviceManager::release_devices()
{
// Release all the used devices
- for (map<shared_ptr<device::DevInst>, SigSession*>::iterator i =
- _used_devices.begin(); i != _used_devices.end(); i++)
- release_device((*i).first);
-
- _used_devices.clear();
+ for (shared_ptr<device::Device> dev : _devices) {
+ assert(dev);
+ dev->release();
+ }
// Clear all the drivers
sr_dev_driver **const drivers = sr_driver_list();
void DeviceManager::release_driver(struct sr_dev_driver *const driver)
{
- assert(driver);
- for (map<shared_ptr<device::DevInst>, SigSession*>::iterator i =
- _used_devices.begin(); i != _used_devices.end(); i++)
- if((*i).first->dev_inst()->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->dev_inst());
- }
+ for (shared_ptr<device::Device> 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(shared_ptr<device::DevInst> a,
- shared_ptr<device::DevInst> b)
+bool DeviceManager::compare_devices(shared_ptr<device::Device> a,
+ shared_ptr<device::Device> b)
{
assert(a);
assert(b);
projects / pulseview.git / blobdiff