diff options
author | jkim <jkim@FreeBSD.org> | 2010-09-16 20:08:00 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2010-09-16 20:08:00 +0000 |
commit | ddeb148f3efdd930ab31c3975094d7115bca6e40 (patch) | |
tree | f70f94cd7c27ae47515d31be78c40b03574a2e07 /sys/dev/acpica | |
parent | 9ec9faa74565cd85da140c68d73c827afe182cc2 (diff) | |
parent | c5863557e158eb3876688e611d5915c27657e18a (diff) | |
download | FreeBSD-src-ddeb148f3efdd930ab31c3975094d7115bca6e40.zip FreeBSD-src-ddeb148f3efdd930ab31c3975094d7115bca6e40.tar.gz |
Merge ACPICA 20100915.
Diffstat (limited to 'sys/dev/acpica')
-rw-r--r-- | sys/dev/acpica/Osd/OsdHardware.c | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/sys/dev/acpica/Osd/OsdHardware.c b/sys/dev/acpica/Osd/OsdHardware.c index 15ab026..ab5be43 100644 --- a/sys/dev/acpica/Osd/OsdHardware.c +++ b/sys/dev/acpica/Osd/OsdHardware.c @@ -177,39 +177,3 @@ acpi_bus_number(ACPI_HANDLE root, ACPI_HANDLE curr, ACPI_PCI_ID *PciId) bus = pci_cfgregread(bus, slot, func, PCIR_SECBUS_2, 1); return (bus); } - -/* - * Find the bus number for a device - * - * Device: handle for the PCI root bridge device - * Region: handle for the PCI configuration space operation region - * PciId: pointer to device slot and function, we fill out bus - */ -void -AcpiOsDerivePciId(ACPI_HANDLE Device, ACPI_HANDLE Region, ACPI_PCI_ID **PciId) -{ - ACPI_HANDLE parent; - ACPI_STATUS status; - int bus; - - if (pci_cfgregopen() == 0) - panic("AcpiOsDerivePciId unable to initialize pci bus"); - - /* Try to read _BBN for bus number if we're at the root. */ - bus = 0; - if (Device == Region) { - status = acpi_GetInteger(Device, "_BBN", &bus); - if (ACPI_FAILURE(status) && bootverbose) - printf("AcpiOsDerivePciId: root bus has no _BBN, assuming 0\n"); - } - - /* Get the parent handle and call the recursive case. */ - if (ACPI_SUCCESS(AcpiGetParent(Region, &parent))) - bus = acpi_bus_number(Device, parent, *PciId); - (*PciId)->Bus = bus; - if (bootverbose) { - printf("AcpiOsDerivePciId: %s -> bus %d dev %d func %d\n", - acpi_name(Region), (*PciId)->Bus, (*PciId)->Device, - (*PciId)->Function); - } -} |