Fix bug walking list of ACPI descriptors searching for bus ranges.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6290 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciEnumeratorSupport.c b/DuetPkg/PciBusNoEnumerationDxe/PciEnumeratorSupport.c
index 0b6658d61c0d4cd3275c4a2581b524a5c8326e2c..2f0a1757c06e53f568e9fd16f16ab25a029723a7 100644 (file)
--- a/DuetPkg/PciBusNoEnumerationDxe/PciEnumeratorSupport.c
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciEnumeratorSupport.c
@@ -1291,7 +1291,7 @@ Returns:
     return Status;\r
   }\r
 \r
-  while (PciGetBusRange (Descriptors, &MinBus, &MaxBus, NULL) == EFI_SUCCESS) {\r
+  while (PciGetBusRange (&Descriptors, &MinBus, &MaxBus, NULL) == EFI_SUCCESS) {\r
 \r
     //\r
     // Create a device node for root bridge device with a NULL host bridge controller handle\r
@@ -1335,7 +1335,7 @@ Returns:
 \r
 EFI_STATUS\r
 PciGetBusRange (\r
-  IN     EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR  *Descriptors,\r
+  IN     EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR  **Descriptors,\r
   OUT    UINT16                             *MinBus,\r
   OUT    UINT16                             *MaxBus,\r
   OUT    UINT16                             *BusRange\r
@@ -1360,23 +1360,23 @@ Returns:
 --*/\r
 {\r
 \r
-  while (Descriptors->Desc != ACPI_END_TAG_DESCRIPTOR) {\r
-    if (Descriptors->ResType == ACPI_ADDRESS_SPACE_TYPE_BUS) {\r
+  while ((*Descriptors)->Desc != ACPI_END_TAG_DESCRIPTOR) {\r
+    if ((*Descriptors)->ResType == ACPI_ADDRESS_SPACE_TYPE_BUS) {\r
       if (MinBus != NULL) {\r
-        *MinBus = (UINT16)Descriptors->AddrRangeMin;\r
+        *MinBus = (UINT16)(*Descriptors)->AddrRangeMin;\r
       }\r
 \r
       if (MaxBus != NULL) {\r
-        *MaxBus = (UINT16)Descriptors->AddrRangeMax;\r
+        *MaxBus = (UINT16)(*Descriptors)->AddrRangeMax;\r
       }\r
 \r
       if (BusRange != NULL) {\r
-        *BusRange = (UINT16)Descriptors->AddrLen;\r
+        *BusRange = (UINT16)(*Descriptors)->AddrLen;\r
       }\r
       return EFI_SUCCESS;\r
     }\r
 \r
-    Descriptors ++;\r
+    (*Descriptors)++;\r
   }\r
 \r
   return EFI_NOT_FOUND;\r

diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciEnumeratorSupport.h b/DuetPkg/PciBusNoEnumerationDxe/PciEnumeratorSupport.h
index 420ee6bf9bd727d58337fc51f03b42bf220b07dc..3f028ee2c2cce6a4fd4a6f5031bd762ba016a89a 100644 (file)
--- a/DuetPkg/PciBusNoEnumerationDxe/PciEnumeratorSupport.h
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciEnumeratorSupport.h
@@ -81,7 +81,7 @@ Returns:
 \r
 EFI_STATUS\r
 PciGetBusRange (\r
-  IN     EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR  *Descriptors,\r
+  IN     EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR  **Descriptors,\r
   OUT    UINT16                             *MinBus,\r
   OUT    UINT16                             *MaxBus,\r
   OUT    UINT16                             *BusRange\r

diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciRomTable.c b/DuetPkg/PciBusNoEnumerationDxe/PciRomTable.c
index 15426ecd926eef037ad88769b02b4191361efad2..d14a0d56da8c4421eb4b403368abda511f793ec1 100644 (file)
--- a/DuetPkg/PciBusNoEnumerationDxe/PciRomTable.c
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciRomTable.c
@@ -310,7 +310,7 @@ Returns:
           return Status;\r
         }\r
 \r
-        PciGetBusRange (Descriptors, &MinBus, &MaxBus, NULL);\r
+        PciGetBusRange (&Descriptors, &MinBus, &MaxBus, NULL);\r
         if ((MinBus <= PciOptionRomDescriptor->Bus) && (PciOptionRomDescriptor->Bus <= MaxBus)) {\r
           Status = PciRomLoadEfiDriversFromRomImage (This, PciOptionRomDescriptor);\r
           PciOptionRomDescriptor->DontLoadEfiRom |= 2;\r