1. Update Fat Binaries to fix a migration bug about EFI lock semantics change.

[mirror_edk2.git] / DuetPkg / PciBusNoEnumerationDxe / PciEnumeratorSupport.c

diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciEnumeratorSupport.c b/DuetPkg/PciBusNoEnumerationDxe/PciEnumeratorSupport.c
index 01d991df89d7dcdbc04d73de9a8f16358745d1a6..a21df4cec23786951d78d4c191641426f746a72d 100644 (file)
--- a/DuetPkg/PciBusNoEnumerationDxe/PciEnumeratorSupport.c
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciEnumeratorSupport.c
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2005 - 2007, Intel Corporation                                                         \r
+Copyright (c) 2005 - 2009, Intel Corporation                                                         \r
 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
@@ -21,7 +21,7 @@ Revision History
 \r
 --*/\r
 \r
-#include "Pcibus.h"\r
+#include "PciBus.h"\r
 \r
 EFI_STATUS \r
 InitializePPB (\r
@@ -484,7 +484,7 @@ Returns:
 {\r
   PCI_IO_DEVICE                   *PciIoDevice;\r
   EFI_STATUS                      Status;\r
-  UINT32                          Value;\r
+  UINT8                           Value;\r
   EFI_PCI_IO_PROTOCOL             *PciIo;\r
   UINT8                           Temp;\r
 \r
@@ -818,7 +818,7 @@ Returns:
     // will block forwarding 0x100-0x3ff for each 1KB in the \r
     // first 64KB I/O range.\r
     //\r
-    if (!BridgeControl & EFI_PCI_BRIDGE_CONTROL_ISA) {\r
+    if ((BridgeControl & EFI_PCI_BRIDGE_CONTROL_ISA) != 0) {\r
       PciIoDevice->Attributes |= EFI_PCI_IO_ATTRIBUTE_ISA_IO;\r
     } \r
 \r
@@ -864,7 +864,7 @@ Returns:
 --*/\r
 {\r
   UINT32      Value;\r
-  UINT64      BarValue64;\r
+  //UINT64      BarValue64;\r
   UINT32      OriginalValue;\r
   UINT32      Mask;\r
   UINT32      Data;\r
@@ -873,7 +873,7 @@ Returns:
 \r
   OriginalValue = 0;\r
   Value         = 0;\r
-  BarValue64    = 0;\r
+  //BarValue64    = 0;\r
 \r
   Status = BarExisted (\r
             PciIoDevice,\r
@@ -923,7 +923,7 @@ Returns:
     // Need to treat it as no-bar\r
     //\r
     if (PciIoDevice->PciBar[BarIndex].Length == 0) {\r
-      PciIoDevice->PciBar[BarIndex].BarType = 0;\r
+      PciIoDevice->PciBar[BarIndex].BarType = PciBarTypeUnknown;\r
     }\r
 \r
     PciIoDevice->PciBar[BarIndex].Prefetchable  = FALSE;\r
@@ -994,7 +994,7 @@ Returns:
       Data  = Value;\r
       Index = 0;\r
       for (Data = Value; Data != 0; Data >>= 1) {\r
-       Index ++;\r
+        Index ++;\r
       }\r
       Value |= ((UINT32)(-1) << Index); \r
 \r
@@ -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