projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Automatically save/restore main window state
[pulseview.git]
/
pv
/
devicemanager.cpp
diff --git
a/pv/devicemanager.cpp
b/pv/devicemanager.cpp
index 4018c0470ee031ce17f3d37664c115bb79865992..bbcfbf247675b345ab5af39376a930af132ca2e8 100644
(file)
--- a/
pv/devicemanager.cpp
+++ b/
pv/devicemanager.cpp
@@
-19,15
+19,21
@@
*/
#include "devicemanager.h"
*/
#include "devicemanager.h"
+#include "device/device.h"
+#include "sigsession.h"
#include <cassert>
#include <cassert>
-#include <cstring>
#include <stdexcept>
#include <string>
#include <libsigrok/libsigrok.h>
#include <stdexcept>
#include <string>
#include <libsigrok/libsigrok.h>
-using namespace std;
+using std::list;
+using std::map;
+using std::ostringstream;
+using std::runtime_error;
+using std::shared_ptr;
+using std::string;
namespace pv {
namespace pv {
@@
-43,35
+49,36
@@
DeviceManager::~DeviceManager()
release_devices();
}
release_devices();
}
-const
std::list<sr_dev_inst*
>& DeviceManager::devices() const
+const
list< shared_ptr<pv::device::Device>
>& DeviceManager::devices() const
{
return _devices;
}
{
return _devices;
}
-list<
sr_dev_inst*
> DeviceManager::driver_scan(
+list<
shared_ptr<device::Device>
> DeviceManager::driver_scan(
struct sr_dev_driver *const driver, GSList *const drvopts)
{
struct sr_dev_driver *const driver, GSList *const drvopts)
{
- list<
sr_dev_inst*
> 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.
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();
+
auto
i = _devices.begin();
while (i != _devices.end()) {
while (i != _devices.end()) {
- if ((*i)->driver == driver)
+ if ((*i)->d
ev_inst()->d
river == driver)
i = _devices.erase(i);
else
i++;
}
i = _devices.erase(i);
else
i++;
}
- //
Clear all the old device instances from this driver
-
sr_dev_clea
r(driver);
+ //
Release this driver and all it's attached devices
+
release_drive
r(driver);
// Do the scan
GSList *const devices = sr_driver_scan(driver, drvopts);
for (GSList *l = devices; l; l = l->next)
// 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<device::Device>(
+ new device::Device((sr_dev_inst*)l->data)));
g_slist_free(devices);
driver_devices.sort(compare_devices);
g_slist_free(devices);
driver_devices.sort(compare_devices);
@@
-98,6
+105,13
@@
void DeviceManager::init_drivers()
void DeviceManager::release_devices()
{
void DeviceManager::release_devices()
{
+ // Release all the used devices
+ for (shared_ptr<device::Device> dev : _devices) {
+ assert(dev);
+ dev->release();
+ }
+
+ // Clear all the drivers
sr_dev_driver **const drivers = sr_driver_list();
for (sr_dev_driver **driver = drivers; *driver; driver++)
sr_dev_clear(*driver);
sr_dev_driver **const drivers = sr_driver_list();
for (sr_dev_driver **driver = drivers; *driver; driver++)
sr_dev_clear(*driver);
@@
-111,25
+125,24
@@
void DeviceManager::scan_all_drivers()
driver_scan(*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;
+ for (shared_ptr<device::Device> dev : _devices) {
+ assert(dev);
+ if(dev->dev_inst()->driver == driver)
+ dev->release();
+ }
- 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<device::Device> a,
+ shared_ptr<device::Device> b)
+{
+ assert(a);
+ assert(b);
+ return a->format_device_title().compare(b->format_device_title()) < 0;
}
} // namespace pv
}
} // namespace pv