From e1001af1d40370ff40cece775aaf10a2f8a0414e Mon Sep 17 00:00:00 2001
From: qwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Tue, 4 Sep 2007 06:10:44 +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@3771 6f19259b-4bc3-4df7-8a09-765794883524
---
 Nt32Pkg/Library/EdkGenericBdsLib/BdsBoot.c                | 8 ++++----
 .../Library/EdkGenericBdsLib/EdkGenericBdsLibInternal.h   | 2 +-
 Nt32Pkg/Sec/SecMain.c                                     | 6 +++---
 Nt32Pkg/Sec/SecMain.h                                     | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/BdsBoot.c b/Nt32Pkg/Library/EdkGenericBdsLib/BdsBoot.c
index 69f41c0484..2e241ed6b9 100644
--- a/Nt32Pkg/Library/EdkGenericBdsLib/BdsBoot.c
+++ b/Nt32Pkg/Library/EdkGenericBdsLib/BdsBoot.c
@@ -20,7 +20,7 @@ Abstract:
 
 --*/
 
-#include <EdkGenericBdsLibInternal.h>
+#include "EdkGenericBdsLibInternal.h"
 
 BOOLEAN mEnumBootDevice = FALSE;
 
@@ -771,7 +771,7 @@ Returns:
   UINTN                         NumberLoadFileHandles;
   EFI_HANDLE                    *LoadFileHandles;
   VOID                          *ProtocolInstance;
-  EFI_FIRMWARE_VOLUME_PROTOCOL  *Fv;
+  EFI_FIRMWARE_VOLUME2_PROTOCOL *Fv;
   UINTN                         FvHandleCount;
   EFI_HANDLE                    *FvHandleBuffer;
   EFI_FV_FILETYPE               Type;
@@ -902,7 +902,7 @@ Returns:
   //
   gBS->LocateHandleBuffer (
         ByProtocol,
-        &gEfiFirmwareVolumeProtocolGuid,
+        &gEfiFirmwareVolume2ProtocolGuid,
         NULL,
         &FvHandleCount,
         &FvHandleBuffer
@@ -910,7 +910,7 @@ Returns:
   for (Index = 0; Index < FvHandleCount; Index++) {
     gBS->HandleProtocol (
           FvHandleBuffer[Index],
-          &gEfiFirmwareVolumeProtocolGuid,
+          &gEfiFirmwareVolume2ProtocolGuid,
           (VOID **) &Fv
           );
 
diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLibInternal.h b/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLibInternal.h
index 478e1ba850..991d9b268b 100644
--- a/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLibInternal.h
+++ b/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLibInternal.h
@@ -33,7 +33,7 @@
 #include <Protocol/DriverBinding.h>
 #include <Protocol/LoadFile.h>
 #include <Protocol/DevicePath.h>
-#include <Protocol/FirmwareVolume.h>
+#include <Protocol/FirmwareVolume2.h>
 #include <Protocol/Performance.h>
 #include <Protocol/WinNtIo.h>
 #include <Guid/PcAnsi.h>
diff --git a/Nt32Pkg/Sec/SecMain.c b/Nt32Pkg/Sec/SecMain.c
index be30d2611d..ab66dfc52c 100644
--- a/Nt32Pkg/Sec/SecMain.c
+++ b/Nt32Pkg/Sec/SecMain.c
@@ -426,12 +426,12 @@ Returns:
 EFI_STATUS
 EFIAPI
 SecPeiReportStatusCode (
-  IN EFI_PEI_SERVICES           **PeiServices,
+  IN CONST EFI_PEI_SERVICES           **PeiServices,
   IN EFI_STATUS_CODE_TYPE       CodeType,
   IN EFI_STATUS_CODE_VALUE      Value,
   IN UINT32                     Instance,
-  IN EFI_GUID                   *CallerId,
-  IN EFI_STATUS_CODE_DATA       *Data OPTIONAL
+  IN CONST EFI_GUID                   *CallerId,
+  IN CONST EFI_STATUS_CODE_DATA       *Data OPTIONAL
   )
 /*++
 
diff --git a/Nt32Pkg/Sec/SecMain.h b/Nt32Pkg/Sec/SecMain.h
index e210a719f2..a91467ae33 100644
--- a/Nt32Pkg/Sec/SecMain.h
+++ b/Nt32Pkg/Sec/SecMain.h
@@ -170,12 +170,12 @@ Returns:
 EFI_STATUS
 EFIAPI
 SecPeiReportStatusCode (
-  IN EFI_PEI_SERVICES         **PeiServices,
+  IN CONST EFI_PEI_SERVICES         **PeiServices,
   IN EFI_STATUS_CODE_TYPE     CodeType,
   IN EFI_STATUS_CODE_VALUE    Value,
   IN UINT32                   Instance,
-  IN EFI_GUID                 * CallerId,
-  IN EFI_STATUS_CODE_DATA     * Data OPTIONAL
+  IN CONST EFI_GUID                 * CallerId,
+  IN CONST EFI_STATUS_CODE_DATA     * Data OPTIONAL
   )
 /*++
 
-- 
2.39.2