From 22936e958fb551cfa38a92b846ba43434d0c6cee Mon Sep 17 00:00:00 2001
From: qwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Tue, 4 Sep 2007 06:09:39 +0000
Subject: [PATCH] Merge the PI enabling works from the branch

First round of PI enabling work:
1) PiPeiCis changes (CONST, EFI_PEI_FILE_HANDLE.. etc)
2) Make use of FirmwareVolume 2 protocol.
3) Verified for Nt32Pkg and real platform for S3.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3770 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../Library/PeiSmbusLibSmbusPpi/InternalSmbusLib.h          | 5 +++--
 IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/PeiSmbusLib.c | 6 +++---
 .../Library/PeiSmbusLibSmbusPpi/PeiSmbusLibSmbusPpi.inf     | 1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/InternalSmbusLib.h b/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/InternalSmbusLib.h
index 3821dacb63..216f806716 100644
--- a/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/InternalSmbusLib.h
+++ b/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/InternalSmbusLib.h
@@ -25,6 +25,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/SmbusLib.h>
 #include <Library/DebugLib.h>
 #include <Library/PeiServicesTablePointerLib.h>
+#include <Library/PeiServicesLib.h>
 #include <Library/BaseMemoryLib.h>
 
 #define SMBUS_LIB_SLAVE_ADDRESS(SmBusAddress)      (((SmBusAddress) >> 1)  & 0x7f)
@@ -42,14 +43,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
   This internal function retrieves Smbus PPI from PPI database.
 
-  @param  PeiServices   An indirect pointer to the EFI_PEI_SERVICES published by the PEI Foundation.
+  @param  VOID
 
   @return The pointer to Smbus PPI.
 
 **/
 EFI_PEI_SMBUS_PPI *
 InternalGetSmbusPpi (
-  EFI_PEI_SERVICES      **PeiServices
+  VOID
   );
 
 /**
diff --git a/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/PeiSmbusLib.c b/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/PeiSmbusLib.c
index db28021d58..dcae66e8bb 100644
--- a/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/PeiSmbusLib.c
+++ b/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/PeiSmbusLib.c
@@ -29,13 +29,13 @@ Module Name: PeiSmbusLib.c
 **/
 EFI_PEI_SMBUS_PPI *
 InternalGetSmbusPpi (
-  EFI_PEI_SERVICES      **PeiServices
+  VOID
   ) 
 {
   EFI_STATUS            Status;
   EFI_PEI_SMBUS_PPI     *SmbusPpi;
 
-  Status = (*PeiServices)->LocatePpi (PeiServices, &gEfiPeiSmbusPpiGuid, 0, NULL, (VOID **) &SmbusPpi);
+  Status = PeiServicesLocatePpi (&gEfiPeiSmbusPpiGuid, 0, NULL, (VOID **) &SmbusPpi);
   ASSERT_EFI_ERROR (Status);
   ASSERT (SmbusPpi != NULL);
 
@@ -78,7 +78,7 @@ InternalSmBusExec (
   EFI_SMBUS_DEVICE_ADDRESS  SmbusDeviceAddress;
 
   PeiServices = GetPeiServicesTablePointer ();
-  SmbusPpi    = InternalGetSmbusPpi (PeiServices);
+  SmbusPpi    = InternalGetSmbusPpi ();
   SmbusDeviceAddress.SmbusDeviceAddress = SMBUS_LIB_SLAVE_ADDRESS (SmBusAddress);
 
   ReturnStatus = SmbusPpi->Execute (
diff --git a/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/PeiSmbusLibSmbusPpi.inf b/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/PeiSmbusLibSmbusPpi.inf
index f6695a6c2c..c47d5ac73c 100644
--- a/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/PeiSmbusLibSmbusPpi.inf
+++ b/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/PeiSmbusLibSmbusPpi.inf
@@ -45,6 +45,7 @@
 [LibraryClasses]
   BaseMemoryLib
   PeiServicesTablePointerLib
+  PeiServicesLib
   DebugLib