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

Only attach "legacy" PCI busses if none have been attached via any other

Browse Source 
method.
This commit is contained in:
Mike Smith 2000-10-09 00:44:41 +00:00
parent 0441aa9a52
commit 03de26e0d0
2 changed files with 46 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sys/amd64/pci/pci_bus.c
View File

@ -257,9 +257,20 @@ nexus_pcib_identify(driver_t *driver, device_t parent)
int pcifunchigh;
int found824xx = 0;
device_t child;
devclass_t pci_devclass;
if (pci_cfgregopen() == 0)
return;
/*
* Check to see if we haven't already had a PCI bus added
* via some other means. If we have, bail since otherwise
* we're going to end up duplicating it.
*/
if ((pci_devclass = devclass_find("pci")) &&
devclass_get_device(pci_devclass, 0))
return;
bus = 0;
retry:
for (slot = 0; slot <= PCI_SLOTMAX; slot++) {
@ -349,11 +360,20 @@ nexus_pcib_identify(driver_t *driver, device_t parent)
static int
nexus_pcib_probe(device_t dev)
{
devclass_t pci_devclass;
if (pci_cfgregopen() != 0)
return 0;
if (pci_cfgregopen() == 0)
return ENXIO;
/*
* Check to see if we haven't already had a PCI bus added
* via some other means. If we have, bail since otherwise
* we're going to end up duplicating it.
*/
if ((pci_devclass = devclass_find("pci")) &&
devclass_get_device(pci_devclass, 0))
return ENXIO;
return ENXIO;
return 0;
}
static int

26
sys/i386/pci/pci_bus.c
View File

@ -257,9 +257,20 @@ nexus_pcib_identify(driver_t *driver, device_t parent)
int pcifunchigh;
int found824xx = 0;
device_t child;
devclass_t pci_devclass;
if (pci_cfgregopen() == 0)
return;
/*
* Check to see if we haven't already had a PCI bus added
* via some other means. If we have, bail since otherwise
* we're going to end up duplicating it.
*/
if ((pci_devclass = devclass_find("pci")) &&
devclass_get_device(pci_devclass, 0))
return;
bus = 0;
retry:
for (slot = 0; slot <= PCI_SLOTMAX; slot++) {
@ -349,11 +360,20 @@ nexus_pcib_identify(driver_t *driver, device_t parent)
static int
nexus_pcib_probe(device_t dev)
{
devclass_t pci_devclass;
if (pci_cfgregopen() != 0)
return 0;
if (pci_cfgregopen() == 0)
return ENXIO;
/*
* Check to see if we haven't already had a PCI bus added
* via some other means. If we have, bail since otherwise
* we're going to end up duplicating it.
*/
if ((pci_devclass = devclass_find("pci")) &&
devclass_get_device(pci_devclass, 0))
return ENXIO;
return ENXIO;
return 0;
}
static int