Removes the assumption in Supported() and Start() routine that the EFI_SIO_PROTOCOL...

[mirror_edk2.git] / IntelFrameworkModulePkg / Bus / Isa / IsaIoDxe / IsaDriver.c

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaDriver.c b/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaDriver.c
index 1b06bc5e6e07608a99caeb295c75d08d1e16f422..8c58b318c6749c16bc4daa22bb8fd77bd35df47c 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaDriver.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaDriver.c
@@ -106,12 +106,6 @@ IsaIoDriverSupported (
     // Get the PciIo protocol from its parent controller.\r
     //\r
     Status = gBS->LocateDevicePath (&gEfiPciIoProtocolGuid, &DevicePath, &PciHandle);\r
-    if (!EFI_ERROR (Status)) {\r
-      if ((DevicePathType (DevicePath) != ACPI_DEVICE_PATH) ||\r
-          ((DevicePathSubType (DevicePath) != ACPI_DP) && (DevicePathSubType (DevicePath) != ACPI_EXTENDED_DP))) {\r
-        Status = EFI_UNSUPPORTED;\r
-      }\r
-    }\r
   }\r
 \r
   if (EFI_ERROR (Status)) {\r
@@ -181,7 +175,7 @@ IsaIoDriverStart (
   EFI_HANDLE                            PciHandle;\r
   EFI_SIO_PROTOCOL                      *Sio;\r
   ACPI_RESOURCE_HEADER_PTR              Resources;\r
-  EFI_DEVICE_PATH_PROTOCOL              *AcpiNode;\r
+  EFI_DEVICE_PATH_PROTOCOL              *TempDevicePath;\r
   ISA_IO_DEVICE                         *IsaIoDevice;\r
 \r
   PciIo = NULL;\r
@@ -205,16 +199,9 @@ IsaIoDriverStart (
   //\r
   // Get the PciIo protocol from its parent controller.\r
   //\r
-  AcpiNode = DevicePath;\r
-  Status = gBS->LocateDevicePath (&gEfiPciIoProtocolGuid, &AcpiNode, &PciHandle);\r
+  TempDevicePath = DevicePath;\r
+  Status = gBS->LocateDevicePath (&gEfiPciIoProtocolGuid, &TempDevicePath, &PciHandle);\r
   if (!EFI_ERROR (Status)) {\r
-    //\r
-    // AcpiNode should point to the ACPI node now.\r
-    //\r
-    ASSERT ((DevicePathType (AcpiNode) == ACPI_DEVICE_PATH) &&\r
-            ((DevicePathSubType (AcpiNode) == ACPI_DP) || (DevicePathSubType (AcpiNode) == ACPI_EXTENDED_DP))\r
-           );\r
-\r
     Status = gBS->HandleProtocol (PciHandle, &gEfiPciIoProtocolGuid, (VOID **) &PciIo);\r
     ASSERT_EFI_ERROR (Status);\r
 \r