tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removes the assumption in Supported() and Start() routine that the EFI_SIO_PROTOCOL is installed in the immediate child handle of the PCI controller. Multiple SIO platform could have an additional layer between the PCI controller and the EFI_SIO_PROTOCOL instance. 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11178 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
niruiyu 2010-12-17 05:55:47 +00:00
parent 304a39b746
commit 12b7f509dc
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaDriver.c
View File

@ -106,12 +106,6 @@ IsaIoDriverSupported (
// Get the PciIo protocol from its parent controller.
//
Status = gBS->LocateDevicePath (&gEfiPciIoProtocolGuid, &DevicePath, &PciHandle);
if (!EFI_ERROR (Status)) {
if ((DevicePathType (DevicePath) != ACPI_DEVICE_PATH) ||
((DevicePathSubType (DevicePath) != ACPI_DP) && (DevicePathSubType (DevicePath) != ACPI_EXTENDED_DP))) {
Status = EFI_UNSUPPORTED;
}
}
}
if (EFI_ERROR (Status)) {
@ -181,7 +175,7 @@ IsaIoDriverStart (
EFI_HANDLE PciHandle;
EFI_SIO_PROTOCOL *Sio;
ACPI_RESOURCE_HEADER_PTR Resources;
EFI_DEVICE_PATH_PROTOCOL *AcpiNode;
EFI_DEVICE_PATH_PROTOCOL *TempDevicePath;
ISA_IO_DEVICE *IsaIoDevice;
PciIo = NULL;
@ -205,16 +199,9 @@ IsaIoDriverStart (
//
// Get the PciIo protocol from its parent controller.
//
AcpiNode = DevicePath;
Status = gBS->LocateDevicePath (&gEfiPciIoProtocolGuid, &AcpiNode, &PciHandle);
TempDevicePath = DevicePath;
Status = gBS->LocateDevicePath (&gEfiPciIoProtocolGuid, &TempDevicePath, &PciHandle);
if (!EFI_ERROR (Status)) {
//
// AcpiNode should point to the ACPI node now.
//
ASSERT ((DevicePathType (AcpiNode) == ACPI_DEVICE_PATH) &&
((DevicePathSubType (AcpiNode) == ACPI_DP) || (DevicePathSubType (AcpiNode) == ACPI_EXTENDED_DP))
);
Status = gBS->HandleProtocol (PciHandle, &gEfiPciIoProtocolGuid, (VOID **) &PciIo);
ASSERT_EFI_ERROR (Status);