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 LakeportX64Pkg (S3) and Nt32Pkg

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3769 6f19259b-4bc3-4df7-8a09-765794883524

9 files changed, 22 insertions, 22 deletions

diff --git a/IntelFrameworkModulePkg/Library/GraphicsLib/CommonHeader.h b/IntelFrameworkModulePkg/Library/GraphicsLib/CommonHeader.h
index f2bf0e1c9b..10dc49ea7f 100644
--- a/IntelFrameworkModulePkg/Library/GraphicsLib/CommonHeader.h
+++ b/IntelFrameworkModulePkg/Library/GraphicsLib/CommonHeader.h
@@ -23,7 +23,7 @@
 #include <Protocol/OEMBadging.h>

 #include <Protocol/ConsoleControl.h>

 #include <Protocol/GraphicsOutput.h>

-#include <Protocol/FirmwareVolume.h>

+#include <Protocol/FirmwareVolume2.h>

 #include <Protocol/UgaDraw.h>

 #include <Protocol/HiiFramework.h>

 

diff --git a/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c b/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c
index 0881c3d965..605a240bf2 100644
--- a/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c
+++ b/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c
@@ -56,14 +56,14 @@ Returns:
   EFI_STATUS                    Status;

   UINTN                         FvProtocolCount;

   EFI_HANDLE                    *FvHandles;

-  EFI_FIRMWARE_VOLUME_PROTOCOL  *Fv;

+  EFI_FIRMWARE_VOLUME2_PROTOCOL *Fv;

   UINTN                         Index;

   UINT32                        AuthenticationStatus;

 

 

   Status = gBS->LocateHandleBuffer (

                   ByProtocol,

-                  &gEfiFirmwareVolumeProtocolGuid,

+                  &gEfiFirmwareVolume2ProtocolGuid,

                   NULL,

                   &FvProtocolCount,

                   &FvHandles

@@ -75,7 +75,7 @@ Returns:
   for (Index = 0; Index < FvProtocolCount; Index++) {

     Status = gBS->HandleProtocol (

                     FvHandles[Index],

-                    &gEfiFirmwareVolumeProtocolGuid,

+                    &gEfiFirmwareVolume2ProtocolGuid,

                     (VOID **) &Fv

                     );

 

diff --git a/IntelFrameworkModulePkg/Library/GraphicsLib/GraphicsLib.inf b/IntelFrameworkModulePkg/Library/GraphicsLib/GraphicsLib.inf
index 9674d5f601..dc82000bbf 100644
--- a/IntelFrameworkModulePkg/Library/GraphicsLib/GraphicsLib.inf
+++ b/IntelFrameworkModulePkg/Library/GraphicsLib/GraphicsLib.inf
@@ -55,6 +55,6 @@
   gEfiGraphicsOutputProtocolGuid                # PROTOCOL ALWAYS_CONSUMED

   gEfiUgaDrawProtocolGuid                       # PROTOCOL ALWAYS_CONSUMED

   gEfiConsoleControlProtocolGuid                # PROTOCOL ALWAYS_CONSUMED

-  gEfiFirmwareVolumeProtocolGuid                # PROTOCOL ALWAYS_CONSUMED

+  gEfiFirmwareVolume2ProtocolGuid                # PROTOCOL ALWAYS_CONSUMED

   gEfiOEMBadgingProtocolGuid                    # PROTOCOL ALWAYS_CONSUMED

 

diff --git a/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c b/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
index cb77d5fe0d..2d08ccdeb4 100644
--- a/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
+++ b/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
@@ -64,9 +64,9 @@ InternalReportStatusCode (
   IN EFI_STATUS_CODE_DATA     *Data     OPTIONAL

   )

 {

-  EFI_PEI_SERVICES  **PeiServices;

+  CONST EFI_PEI_SERVICES  **PeiServices;

 

-  PeiServices = GetPeiServicesTablePointer ();

+  PeiServices = (CONST EFI_PEI_SERVICES  **) GetPeiServicesTablePointer ();

   return (*PeiServices)->ReportStatusCode (

                            PeiServices,

                            Type,

diff --git a/IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/PciCfg2.c b/IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/PciCfg2.c
index 1cde2025af..2055db3f45 100644
--- a/IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/PciCfg2.c
+++ b/IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/PciCfg2.c
@@ -290,10 +290,10 @@ PeimInitializePciCfg (
   }

   

   if (!FeaturePcdGet (PcdPciCfgDisable)) {

-    Status = (**PeiServices).InstallPpi (PeiServices, &gPciCfgPpiList);

+    Status = (**PeiServices).InstallPpi ((CONST EFI_PEI_SERVICES **)PeiServices, &gPciCfgPpiList);

   } 

   if (!FeaturePcdGet (PcdPciCfg2Disable)) {

-    Status = (**PeiServices).InstallPpi (PeiServices, &gPciCfg2PpiList);

+    Status = (**PeiServices).InstallPpi ((CONST EFI_PEI_SERVICES **)PeiServices, &gPciCfg2PpiList);

   }

 

   return Status;

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c
index 7c0fdc6077..03f25c8fc6 100644
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c
@@ -60,12 +60,12 @@ EFI_PEI_PPI_DESCRIPTOR        mStatusCodePpiDescriptor = {
 EFI_STATUS

 EFIAPI

 ReportDispatcher (

-  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 OPTIONAL,

-  IN EFI_STATUS_CODE_DATA     *Data OPTIONAL

+  IN CONST EFI_GUID                 *CallerId OPTIONAL,

+  IN CONST EFI_STATUS_CODE_DATA     *Data OPTIONAL

   )

 {

   if (FeaturePcdGet (PcdStatusCodeUseSerial)) {

@@ -89,8 +89,8 @@ ReportDispatcher (
       CodeType,

       Value,

       Instance,

-      CallerId,

-      Data

+      (EFI_GUID *)CallerId,

+      (EFI_STATUS_CODE_DATA *)Data

       );

   }

 

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.h b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.h
index 8cf6fd5f7f..c7350d86ad 100644
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.h
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.h
@@ -71,8 +71,8 @@ SerialStatusCodeReportWorker (
   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

   );

 

 

@@ -147,12 +147,12 @@ MemoryStatusCodeReportWorker (
 EFI_STATUS

 EFIAPI

 ReportDispatcher (

-  IN EFI_PEI_SERVICES         **PeiServices,

+  IN CONST EFI_PEI_SERVICES         **PeiServices,

   IN EFI_STATUS_CODE_TYPE     Type,

   IN EFI_STATUS_CODE_VALUE    Value,

   IN UINT32                   Instance,

-  IN EFI_GUID                 *CallerId OPTIONAL,

-  IN EFI_STATUS_CODE_DATA     *Data OPTIONAL

+  IN CONST EFI_GUID                 *CallerId OPTIONAL,

+  IN CONST EFI_STATUS_CODE_DATA     *Data OPTIONAL

   );

 

 #endif

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/SerialStatusCodeWorker.c b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/SerialStatusCodeWorker.c
index 36ff61c473..a23eca0049 100644
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/SerialStatusCodeWorker.c
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/SerialStatusCodeWorker.c
@@ -51,8 +51,8 @@ SerialStatusCodeReportWorker (
   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

   )

 {

   CHAR8           *Filename;

diff --git a/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c b/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c
index 6ace035003..46c898609a 100644
--- a/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c
+++ b/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c
@@ -76,7 +76,7 @@ Returns:
   //

   // Publish the variable capability to other modules

   //

-  return (**PeiServices).InstallPpi (PeiServices, &mPpiListVariable[0]);

+  return (**PeiServices).InstallPpi ((CONST EFI_PEI_SERVICES **) PeiServices, &mPpiListVariable[0]);

 

 }