Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Basically revert r41365. Remove the get_pci_info() function of ACPI again as it

Browse Source 
turns out to be flaky, is a little bit of a hack anyway and performs unnecessary
operations. The functionality is now handled kernel side which optimizes those
problems away.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41372 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz 2011-05-08 01:15:39 +00:00
parent 9b50b2889a
commit 290ac5f9b5
4 changed files with 2 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
headers/os/drivers/ACPI.h
View File

@ -136,14 +136,6 @@ enum {
};
typedef struct acpi_pci_info {
uint16 segment;
uint16 bus;
uint16 device;
uint16 function;
} acpi_pci_info;
/*
* acpi_status should return ACPI specific error codes, not BeOS ones.
*/
@ -257,10 +249,6 @@ struct acpi_module_info {
size_t size);
status_t (*enter_sleep_state)(uint8 state);
status_t (*reboot)(void);
/* PCI specific info */
status_t (*get_pci_info)(acpi_handle pciRootBridge, acpi_handle device,
acpi_pci_info *info);
};

45
src/add-ons/kernel/bus_managers/acpi/acpi_busman.c
View File

@ -705,48 +705,6 @@ reboot(void)
}
status_t
get_pci_info(acpi_handle pciRootBridge, acpi_handle device, acpi_pci_info *info)
{
ACPI_STATUS status;
ACPI_HANDLE childNode;
uint64 deviceAddress = 0;
uint64 segment = 0;
uint64 busNumber = 0;
// We reset the structure to 0 here. Any failed evaluation means default
// values, so we don't have to do anything in the error case.
memset(info, 0, sizeof(acpi_pci_info));
status = AcpiUtEvaluateNumericObject(METHOD_NAME__ADR, device,
&deviceAddress);
if (status == AE_OK) {
info->device = (uint8)(deviceAddress >> 16);
info->function = (uint8)deviceAddress;
}
status = AcpiUtEvaluateNumericObject(METHOD_NAME__SEG, pciRootBridge,
&segment);
if (status == AE_OK)
info->segment = (uint8)segment;
status = AcpiUtEvaluateNumericObject(METHOD_NAME__BBN, pciRootBridge,
&busNumber);
if (status == AE_OK)
info->bus = (uint8)busNumber;
// since AcpiHwDerivePciId assumes getting a child object of the device
// it iterates one step less than we need - get any child node to work
// around that
status = AcpiGetNextObject(ACPI_TYPE_METHOD, device, NULL, &childNode);
if (status != AE_OK)
return B_ERROR;
status = AcpiHwDerivePciId((ACPI_PCI_ID*)info, pciRootBridge, childNode);
return status == AE_OK ? B_OK : B_ERROR;
}
struct acpi_module_info gACPIModule = {
{
B_ACPI_MODULE_NAME,
@ -785,6 +743,5 @@ struct acpi_module_info gACPIModule = {
get_possible_resources,
prepare_sleep_state,
enter_sleep_state,
reboot,
get_pci_info
reboot
};

3
src/add-ons/kernel/bus_managers/acpi/acpi_module.c
View File

@ -218,8 +218,7 @@ static struct acpi_root_info sACPIRootModule = {
get_possible_resources,
prepare_sleep_state,
enter_sleep_state,
reboot,
get_pci_info
reboot
};

7
src/add-ons/kernel/bus_managers/acpi/acpi_priv.h
View File

@ -132,10 +132,6 @@ typedef struct acpi_root_info {
size_t size);
status_t (*enter_sleep_state)(uint8 state);
status_t (*reboot)(void);
/* PCI specific info */
status_t (*get_pci_info)(acpi_handle pciRootBridge, acpi_handle device,
acpi_pci_info *info);
} acpi_root_info;
@ -210,9 +206,6 @@ status_t enter_sleep_state(uint8 state);
status_t reboot(void);
status_t get_pci_info(acpi_handle pciRootBridge, acpi_handle device,
acpi_pci_info *info);
__END_DECLS