d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rewrite puc_pci_match() to handle non-trivial cases correctly.

Browse Source 
MFC after:	1 week
This commit is contained in:
Dag-Erling Smørgrav 2007-10-13 12:14:20 +00:00
parent fa030de012
commit 5efb0f8d7a
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
sys/dev/puc/puc_pci.c
View File

@ -81,24 +81,29 @@ __FBSDID("$FreeBSD$");
static const struct puc_cfg *
puc_pci_match(device_t dev, const struct puc_cfg *desc)
{
uint16_t device, subdev, subven, vendor;
uint16_t vendor, device;
uint16_t subvendor, subdevice;
vendor = pci_get_vendor(dev);
device = pci_get_device(dev);
while (desc->vendor != 0xffff &&
(desc->vendor != vendor || desc->device != device))
subvendor = pci_get_subvendor(dev);
subdevice = pci_get_subdevice(dev);
while (desc->vendor != 0xffff) {
if (desc->vendor == vendor && desc->device == device) {
/* exact match */
if (desc->subvendor == subvendor &&
desc->subdevice == subdevice)
return (desc);
/* wildcard match */
if (desc->subvendor == 0xffff)
return (desc);
}
desc++;
if (desc->vendor == 0xffff)
return (NULL);
if (desc->subvendor == 0xffff)
return (desc);
subven = pci_get_subvendor(dev);
subdev = pci_get_subdevice(dev);
while (desc->vendor == vendor && desc->device == device &&
(desc->subvendor != subven || desc->subdevice != subdev))
desc++;
return ((desc->vendor == vendor && desc->device == device)
? desc : NULL);
}
/* no match */
return (NULL);
}
static int