- for (const GSList *l = _sdi->probes; l; l = l->next) {
- const sr_probe *const p = (const sr_probe *)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;