#include "device.h"
+using std::list;
+using std::make_pair;
+using std::map;
using std::ostringstream;
using std::string;
{
DevInst::use(owner);
- sr_session_new();
+ sr_session_new(&SigSession::_sr_session);
assert(_sdi);
sr_dev_open(_sdi);
- if (sr_session_dev_add(_sdi) != SR_OK)
+ if (sr_session_dev_add(SigSession::_sr_session, _sdi) != SR_OK)
throw QString(tr("Failed to use device."));
}
{
if (_owner) {
DevInst::release();
- sr_session_destroy();
+ sr_session_destroy(SigSession::_sr_session);
}
sr_dev_close(_sdi);
assert(_sdi);
- if (_sdi->vendor && _sdi->vendor[0]) {
- s << _sdi->vendor;
- if ((_sdi->model && _sdi->model[0]) ||
- (_sdi->version && _sdi->version[0]))
- s << ' ';
- }
+ if (_sdi->vendor && _sdi->vendor[0])
+ s << _sdi->vendor << " ";
- if (_sdi->model && _sdi->model[0]) {
- s << _sdi->model;
- if (_sdi->version && _sdi->version[0])
- s << ' ';
- }
+ if (_sdi->model && _sdi->model[0])
+ s << _sdi->model << " ";
if (_sdi->version && _sdi->version[0])
- s << _sdi->version;
+ s << _sdi->version << " ";
+
+ // Show connection string only if no serial number is present.
+ if (_sdi->serial_num && _sdi->serial_num[0])
+ s << "(" << _sdi->serial_num << ") ";
+ else if (_sdi->connection_id && _sdi->connection_id[0])
+ s << "[" << _sdi->connection_id << "] ";
+
+ // Remove trailing space.
+ s.seekp(-1, std::ios_base::end);
+ s << std::ends;
return s.str();
}
-bool Device::is_trigger_enabled() const
+map<string, string> Device::get_device_info() const
{
+ map<string, string> result;
+
assert(_sdi);
- for (const GSList *l = _sdi->channels; l; l = l->next) {
- const sr_channel *const p = (const sr_channel *)l->data;
- assert(p);
- if (p->trigger && p->trigger[0] != '\0')
- return true;
- }
- return false;
+
+ if (_sdi->vendor && _sdi->vendor[0])
+ result.insert(make_pair("vendor", _sdi->vendor));
+
+ if (_sdi->model && _sdi->model[0])
+ result.insert(make_pair("model", _sdi->model));
+
+ if (_sdi->version && _sdi->version[0])
+ result.insert(make_pair("version", _sdi->version));
+
+ if (_sdi->serial_num && _sdi->serial_num[0])
+ result.insert(make_pair("serial_num", _sdi->serial_num));
+
+ if (_sdi->connection_id && _sdi->connection_id[0])
+ result.insert(make_pair("connection_id", _sdi->connection_id));
+
+ return result;
}
} // device