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

- Assume a bus number of zero if evaluating _BBN fails, not if it succeeds.

Browse Source 
This was effectively rendering _BBN useless.
- Cleanup handling of the busok variable a bit.

Submitted by:	marcel (1)
Approved by:	re (rwatson)
This commit is contained in:
John Baldwin 2002-11-25 21:55:04 +00:00
parent 1bbf246462
commit 8745ec57d0
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/dev/acpica/acpi_pcib_acpi.c
View File

@ -164,10 +164,10 @@ acpi_pcib_acpi_attach(device_t dev)
device_printf(dev, "could not evaluate _BBN - %s\n",
AcpiFormatException(status));
return_VALUE(ENXIO);
} else {
/* if it's not found, assume 0 */
sc->ap_bus = 0;
}
} else {
/* if it's not found, assume 0 */
sc->ap_bus = 0;
}
/*
@ -176,16 +176,15 @@ acpi_pcib_acpi_attach(device_t dev)
*/
busok = 1;
if (sc->ap_bus == 0 && devclass_get_device(pcib_devclass, 0) != dev) {
busok = 0;
status = acpi_EvaluateInteger(sc->ap_handle, "_ADR", &addr);
if (ACPI_FAILURE(status)) {
if (status != AE_NOT_FOUND) {
device_printf(dev, "could not evaluate _ADR - %s\n",
AcpiFormatException(status));
return_VALUE(ENXIO);
} else {
} else
device_printf(dev, "could not determine config space address\n");
busok = 0;
}
} else {
/* XXX: We assume bus 0. */
slot = addr >> 16;
@ -193,11 +192,11 @@ acpi_pcib_acpi_attach(device_t dev)
if (bootverbose)
device_printf(dev, "reading config registers from 0:%d:%d\n",
slot, func);
if (host_pcib_get_busno(pci_cfgregread, 0, slot, func, &busno) == 0) {
if (host_pcib_get_busno(pci_cfgregread, 0, slot, func, &busno) == 0)
device_printf(dev, "could not read bus number from config space\n");
busok = 0;
} else {
else {
sc->ap_bus = busno;
busok = 1;
}
}
}