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

Unbork the chip locating code.

Browse Source 
Approved by: re@
This commit is contained in:
Søren Schmidt 2003-05-19 13:42:23 +00:00
parent b8c4149cff
commit c9f5649b3e
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/dev/ata/ata-chipset.c
View File

@ -2003,26 +2003,21 @@ static struct ata_chip_id *
ata_find_chip(device_t dev, struct ata_chip_id *index, int slot) ata_find_chip(device_t dev, struct ata_chip_id *index, int slot)
{ {
device_t *children; device_t *children;
u_int32_t devid;
u_int8_t revid;
int nchildren, i; int nchildren, i;
if (device_get_children(device_get_parent(dev), &children, &nchildren)) if (device_get_children(device_get_parent(dev), &children, &nchildren))
return 0; return 0;
devid = pci_get_devid(dev);
revid = pci_get_revid(dev);
while (index->chipid != 0) { while (index->chipid != 0) {
for (i = 0; i < nchildren; i++) { for (i = 0; i < nchildren; i++) {
if (((slot >= 0 && pci_get_slot(children[i]) == slot) || slot < 0)&& if (((slot >= 0 && pci_get_slot(children[i]) == slot) || slot < 0)&&
pci_get_devid(children[i]) == devid && pci_get_devid(children[i]) == index->chipid &&
pci_get_revid(children[i]) >= revid) { pci_get_revid(children[i]) >= index->chiprev) {
free(children, M_TEMP); free(children, M_TEMP);
return index; return index;
} }
} }
index++;
} }
free(children, M_TEMP); free(children, M_TEMP);
return NULL; return NULL;