*/
#include "devicemanager.h"
+#include "devinst.h"
+#include "sigsession.h"
#include <cassert>
-#include <cstring>
#include <stdexcept>
#include <string>
#include <libsigrok/libsigrok.h>
-using namespace std;
+using boost::shared_ptr;
+using std::list;
+using std::map;
+using std::ostringstream;
+using std::runtime_error;
+using std::string;
namespace pv {
release_devices();
}
-const std::list<sr_dev_inst*>& DeviceManager::devices() const
+const list< shared_ptr<pv::DevInst> >& DeviceManager::devices() const
{
return _devices;
}
-list<sr_dev_inst*> DeviceManager::driver_scan(
+void DeviceManager::use_device(shared_ptr<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<DevInst> dev_inst)
+{
+ assert(dev_inst);
+
+ // Notify the owner, and remove the device from the used device list
+ map< shared_ptr<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<DevInst> > DeviceManager::driver_scan(
struct sr_dev_driver *const driver, GSList *const drvopts)
{
- list<sr_dev_inst*> driver_devices;
+ list< shared_ptr<DevInst> > driver_devices;
assert(driver);
// Remove any device instances from this driver from the device
// list. They will not be valid after the scan.
- list<sr_dev_inst*>::iterator i = _devices.begin();
+ list< shared_ptr<DevInst> >::iterator i = _devices.begin();
while (i != _devices.end()) {
- if ((*i)->driver == driver)
+ if ((*i)->dev_inst()->driver == driver)
i = _devices.erase(i);
else
i++;
}
- // Clear all the old device instances from this driver
- sr_dev_clear(driver);
+ // Release this driver and all it's attached devices
+ release_driver(driver);
// 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<DevInst>(
+ new DevInst((sr_dev_inst*)l->data)));
g_slist_free(devices);
driver_devices.sort(compare_devices);
void DeviceManager::release_devices()
{
+ // Release all the used devices
+ for (map<shared_ptr<DevInst>, SigSession*>::iterator i =
+ _used_devices.begin(); i != _used_devices.end(); i++)
+ release_device((*i).first);
+
+ _used_devices.clear();
+
+ // Clear all the drivers
sr_dev_driver **const drivers = sr_driver_list();
for (sr_dev_driver **driver = drivers; *driver; driver++)
sr_dev_clear(*driver);
driver_scan(*driver);
}
-bool DeviceManager::compare_devices(const sr_dev_inst *const a,
- const sr_dev_inst *const b)
+void DeviceManager::release_driver(struct sr_dev_driver *const driver)
{
- assert(a);
- assert(b);
-
- const int vendor_cmp = strcasecmp(a->vendor, b->vendor);
- if(vendor_cmp < 0)
- return true;
- else if(vendor_cmp > 0)
- return false;
+ assert(driver);
+ for (map<shared_ptr<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());
+ }
- const int model_cmp = strcasecmp(a->model, b->model);
- if(model_cmp < 0)
- return true;
- else if(model_cmp > 0)
- return false;
+ // Clear all the old device instances from this driver
+ sr_dev_clear(driver);
+}
- return strcasecmp(a->version, b->version) < 0;
+bool DeviceManager::compare_devices(shared_ptr<DevInst> a,
+ shared_ptr<DevInst> b)
+{
+ assert(a);
+ assert(b);
+ return a->format_device_title().compare(b->format_device_title()) < 0;
}
} // namespace pv