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

diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/BdsBoot.c b/Nt32Pkg/Library/EdkGenericBdsLib/BdsBoot.c
index 69f41c0484c47c7d1b176049b76e13e9f935eb4e..2e241ed6b94dc1cba11301c2640ea9931b83ba0e 100644 (file)
--- a/Nt32Pkg/Library/EdkGenericBdsLib/BdsBoot.c
+++ b/Nt32Pkg/Library/EdkGenericBdsLib/BdsBoot.c
@@ -20,7 +20,7 @@ Abstract:
 \r
 --*/\r
 \r
-#include <EdkGenericBdsLibInternal.h>\r
+#include "EdkGenericBdsLibInternal.h"\r
 \r
 BOOLEAN mEnumBootDevice = FALSE;\r
 \r
@@ -771,7 +771,7 @@ Returns:
   UINTN                         NumberLoadFileHandles;\r
   EFI_HANDLE                    *LoadFileHandles;\r
   VOID                          *ProtocolInstance;\r
-  EFI_FIRMWARE_VOLUME_PROTOCOL  *Fv;\r
+  EFI_FIRMWARE_VOLUME2_PROTOCOL *Fv;\r
   UINTN                         FvHandleCount;\r
   EFI_HANDLE                    *FvHandleBuffer;\r
   EFI_FV_FILETYPE               Type;\r
@@ -902,7 +902,7 @@ Returns:
   //\r
   gBS->LocateHandleBuffer (\r
         ByProtocol,\r
-        &gEfiFirmwareVolumeProtocolGuid,\r
+        &gEfiFirmwareVolume2ProtocolGuid,\r
         NULL,\r
         &FvHandleCount,\r
         &FvHandleBuffer\r
@@ -910,7 +910,7 @@ Returns:
   for (Index = 0; Index < FvHandleCount; Index++) {\r
     gBS->HandleProtocol (\r
           FvHandleBuffer[Index],\r
-          &gEfiFirmwareVolumeProtocolGuid,\r
+          &gEfiFirmwareVolume2ProtocolGuid,\r
           (VOID **) &Fv\r
           );\r
 \r

diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLibInternal.h b/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLibInternal.h
index 478e1ba85015e6d187abb1ee274c5377da71ad76..991d9b268b775e13ed5957e0e9cf04e621890208 100644 (file)
--- a/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLibInternal.h
+++ b/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLibInternal.h
@@ -33,7 +33,7 @@
 #include <Protocol/DriverBinding.h>\r
 #include <Protocol/LoadFile.h>\r
 #include <Protocol/DevicePath.h>\r
-#include <Protocol/FirmwareVolume.h>\r
+#include <Protocol/FirmwareVolume2.h>\r
 #include <Protocol/Performance.h>\r
 #include <Protocol/WinNtIo.h>\r
 #include <Guid/PcAnsi.h>\r

diff --git a/Nt32Pkg/Sec/SecMain.c b/Nt32Pkg/Sec/SecMain.c
index be30d2611d789546ce1abc310da1b96f46ef8266..ab66dfc52cb94aa393b25b2c863eeac8c4ffff43 100644 (file)
--- a/Nt32Pkg/Sec/SecMain.c
+++ b/Nt32Pkg/Sec/SecMain.c
@@ -426,12 +426,12 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 SecPeiReportStatusCode (\r
-  IN EFI_PEI_SERVICES           **PeiServices,\r
+  IN CONST EFI_PEI_SERVICES           **PeiServices,\r
   IN EFI_STATUS_CODE_TYPE       CodeType,\r
   IN EFI_STATUS_CODE_VALUE      Value,\r
   IN UINT32                     Instance,\r
-  IN EFI_GUID                   *CallerId,\r
-  IN EFI_STATUS_CODE_DATA       *Data OPTIONAL\r
+  IN CONST EFI_GUID                   *CallerId,\r
+  IN CONST EFI_STATUS_CODE_DATA       *Data OPTIONAL\r
   )\r
 /*++\r
 \r

diff --git a/Nt32Pkg/Sec/SecMain.h b/Nt32Pkg/Sec/SecMain.h
index e210a719f2642d1a93b8236385b25dc7e8d705e5..a91467ae33a0ff5b4b781c8254cbe108585e9d4b 100644 (file)
--- a/Nt32Pkg/Sec/SecMain.h
+++ b/Nt32Pkg/Sec/SecMain.h
@@ -170,12 +170,12 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 SecPeiReportStatusCode (\r
-  IN EFI_PEI_SERVICES         **PeiServices,\r
+  IN CONST EFI_PEI_SERVICES         **PeiServices,\r
   IN EFI_STATUS_CODE_TYPE     CodeType,\r
   IN EFI_STATUS_CODE_VALUE    Value,\r
   IN UINT32                   Instance,\r
-  IN EFI_GUID                 * CallerId,\r
-  IN EFI_STATUS_CODE_DATA     * Data OPTIONAL\r
+  IN CONST EFI_GUID                 * CallerId,\r
+  IN CONST EFI_STATUS_CODE_DATA     * Data OPTIONAL\r
   )\r
 /*++\r
 \r