From af1b10362dd41b88cb15c91953e986881a6387e6 Mon Sep 17 00:00:00 2001
From: qhuang8 <qhuang8@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Wed, 10 Sep 2008 12:53:36 +0000
Subject: [PATCH] 1. Rename gRT in GlueLib to avoid collision with EfiDriverLib
 2. Add the extra parameter of PciCfg in the new PeiLibPciCfgModify() to keep
 the parameter list the same as the PciCfg->Modify(). PciCfg is just a place
 holder. 3. Allow platform develop to set EDKII_GLUE_PciExpressBaseAddress
 value in build option.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5868 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../Library/EdkIIGlueLib/Include/EdkIIGlueConfig.h          | 2 ++
 .../Include/Library/EdkIIGlueUefiRuntimeServicesTableLib.h  | 5 +++++
 EdkCompatibilityPkg/Foundation/Library/Pei/Include/PeiLib.h | 6 +++++-
 EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/PeiLib.c  | 6 +++++-
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueConfig.h b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueConfig.h
index 180400e511..2c5a3201e7 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueConfig.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueConfig.h
@@ -112,7 +112,9 @@ Abstract:
 // [BuildOptions]
 //   *_*_*_CC_FLAGS = /D PCD_EDKII_GLUE_PciExpressBaseAddress=0xC0000000
 //
+#ifndef EDKII_GLUE_PciExpressBaseAddress
 #define EDKII_GLUE_PciExpressBaseAddress        PCD_EDKII_GLUE_PciExpressBaseAddress
+#endif
 
 //
 //
diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueUefiRuntimeServicesTableLib.h b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueUefiRuntimeServicesTableLib.h
index f4bace19f4..e5a5489a15 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueUefiRuntimeServicesTableLib.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueUefiRuntimeServicesTableLib.h
@@ -23,6 +23,11 @@ Abstract:
 #ifndef __EDKII_GLUE_UEFI_RUNTIME_SERVICES_TABLE_LIB_H__
 #define __EDKII_GLUE_UEFI_RUNTIME_SERVICES_TABLE_LIB_H__
 
+//
+// To avoid symbol collision with gRT in EfiDriverLib
+//
+#define gRT                  gGlueRT
+
 //
 // Cached copy of the EFI Runtime Services Table
 //
diff --git a/EdkCompatibilityPkg/Foundation/Library/Pei/Include/PeiLib.h b/EdkCompatibilityPkg/Foundation/Library/Pei/Include/PeiLib.h
index e3afb4341f..24090b65d4 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Pei/Include/PeiLib.h
+++ b/EdkCompatibilityPkg/Foundation/Library/Pei/Include/PeiLib.h
@@ -1307,6 +1307,7 @@ EFI_STATUS
 EFIAPI 
 PeiLibPciCfgModify (
   IN EFI_PEI_SERVICES         **PeiServices,
+  IN PEI_PCI_CFG_PPI          *PciCfg,
   IN PEI_PCI_CFG_PPI_WIDTH    Width,
   IN UINT64                   Address,
   IN UINTN                    SetBits,
@@ -1337,6 +1338,7 @@ Routine Description:
    it will be updated to the following code which call this library API:
       PeiLibPciCfgModify (
           PeiServices,
+          PciCfg,
           Width,
           Address,
           SetBits,
@@ -1349,7 +1351,9 @@ Arguments:
   
   PeiServices     An indirect pointer to the PEI Services Table
                           published by the PEI Foundation.
-
+  PciCfg          A pointer to the this pointer of EFI_PEI_PCI_CFG_PPI. 
+                          This parameter is unused as a place holder to make
+                          the parameter list identical to PEI_PCI_CFG_PPI_RW.
   Width           The width of the access. Enumerated in bytes. Type
                           EFI_PEI_PCI_CFG_PPI_WIDTH is defined in Read().
 
diff --git a/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/PeiLib.c b/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/PeiLib.c
index 86fbbb1ecd..8c81c478fc 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/PeiLib.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/PeiLib.c
@@ -157,6 +157,7 @@ EFI_STATUS
 EFIAPI 
 PeiLibPciCfgModify (
   IN EFI_PEI_SERVICES         **PeiServices,
+  IN PEI_PCI_CFG_PPI          *PciCfg,
   IN PEI_PCI_CFG_PPI_WIDTH    Width,
   IN UINT64                   Address,
   IN UINTN                    SetBits,
@@ -187,6 +188,7 @@ Routine Description:
    it will be updated to the following code which call this library API:
       PeiLibPciCfgModify (
           PeiServices,
+          PciCfg,
           Width,
           Address,
           SetBits,
@@ -199,7 +201,9 @@ Arguments:
   
   PeiServices     An indirect pointer to the PEI Services Table
                           published by the PEI Foundation.
-
+  PciCfg          A pointer to the this pointer of EFI_PEI_PCI_CFG_PPI. 
+                          This parameter is unused as a place holder to make
+                          the parameter list identical to PEI_PCI_CFG_PPI_RW.
   Width           The width of the access. Enumerated in bytes. Type
                           EFI_PEI_PCI_CFG_PPI_WIDTH is defined in Read().