Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-24 02:42:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

solid: lookup PCI-parented devices vendor/product in PCI database

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-03-28 21:46:09 +03:00
parent 0230eef667
commit 5b10b5e322
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
solid/solid/backends/devinfo/devinfodevice.cpp
View file

@ -51,6 +51,7 @@ int getDeviceProperties(struct devinfo_dev *dev, void *arg)
properties[DevinfoDevice::DeviceDescription] = dev->dd_desc;
properties[DevinfoDevice::DeviceDriver] = dev->dd_drivername;
properties[DevinfoDevice::DevicePnPInfo] = dev->dd_pnpinfo;
properties[DevinfoDevice::DeviceLocation] = dev->dd_location;
typedarg->second = properties;
// device found, abort scan
return -1;
@ -130,9 +131,11 @@ QString DevinfoDevice::vendor() const
return QString();
}
// TODO: lookup either PCI or USB table depending on bus type
QString result = lookupPCIVendor(pnpvendor.constData() + 2);
if (result.isEmpty()) {
const QByteArray parent = deviceProperty(DevinfoDevice::DeviceParent);
QString result;
if (parent.contains("pci")) {
result = lookupPCIVendor(pnpvendor.constData() + 2);
} else {
result = lookupUSBVendor(pnpvendor.constData() + 2);
}
@ -159,9 +162,11 @@ QString DevinfoDevice::product() const
return QString();
}
// TODO: lookup either PCI or USB table depending on bus type
QString result = lookupPCIDevice(pnpvendor.constData() + 2, pnpdevice.constData() + 2);
if (result.isEmpty()) {
const QByteArray parent = deviceProperty(DevinfoDevice::DeviceParent);
QString result;
if (parent.contains("pci")) {
result = lookupPCIDevice(pnpvendor.constData() + 2, pnpdevice.constData() + 2);
} else {
result = lookupUSBDevice(pnpvendor.constData() + 2, pnpdevice.constData() + 2);
}

3
solid/solid/backends/devinfo/devinfodevice.h
View file

@ -41,7 +41,8 @@ public:
DeviceName = 1,
DeviceDescription = 2,
DeviceDriver = 3,
DevicePnPInfo = 4
DevicePnPInfo = 4,
DeviceLocation = 5
};
enum PnPInfo {