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

diff --git a/IntelFrameworkModulePkg/Library/GraphicsLib/CommonHeader.h b/IntelFrameworkModulePkg/Library/GraphicsLib/CommonHeader.h
index f2bf0e1c9b2ae707df8b1a66d349f8e9e5a33afc..10dc49ea7fc17e97e5601d5c4a7686b8a5a6a7ff 100644 (file)
--- a/IntelFrameworkModulePkg/Library/GraphicsLib/CommonHeader.h
+++ b/IntelFrameworkModulePkg/Library/GraphicsLib/CommonHeader.h
@@ -23,7 +23,7 @@
 #include <Protocol/OEMBadging.h>\r
 #include <Protocol/ConsoleControl.h>\r
 #include <Protocol/GraphicsOutput.h>\r
-#include <Protocol/FirmwareVolume.h>\r
+#include <Protocol/FirmwareVolume2.h>\r
 #include <Protocol/UgaDraw.h>\r
 #include <Protocol/HiiFramework.h>\r
 \r

diff --git a/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c b/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c
index 0881c3d9656643a507a22a06ebb6096f07d349ec..605a240bf2b57fe166e4cabe1790eb1253173145 100644 (file)
--- a/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c
+++ b/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c
@@ -56,14 +56,14 @@ Returns:
   EFI_STATUS                    Status;\r
   UINTN                         FvProtocolCount;\r
   EFI_HANDLE                    *FvHandles;\r
-  EFI_FIRMWARE_VOLUME_PROTOCOL  *Fv;\r
+  EFI_FIRMWARE_VOLUME2_PROTOCOL *Fv;\r
   UINTN                         Index;\r
   UINT32                        AuthenticationStatus;\r
 \r
 \r
   Status = gBS->LocateHandleBuffer (\r
                   ByProtocol,\r
-                  &gEfiFirmwareVolumeProtocolGuid,\r
+                  &gEfiFirmwareVolume2ProtocolGuid,\r
                   NULL,\r
                   &FvProtocolCount,\r
                   &FvHandles\r
@@ -75,7 +75,7 @@ Returns:
   for (Index = 0; Index < FvProtocolCount; Index++) {\r
     Status = gBS->HandleProtocol (\r
                     FvHandles[Index],\r
-                    &gEfiFirmwareVolumeProtocolGuid,\r
+                    &gEfiFirmwareVolume2ProtocolGuid,\r
                     (VOID **) &Fv\r
                     );\r
 \r

diff --git a/IntelFrameworkModulePkg/Library/GraphicsLib/GraphicsLib.inf b/IntelFrameworkModulePkg/Library/GraphicsLib/GraphicsLib.inf
index 9674d5f601b5278b7877253e7eda467b8f037767..dc82000bbf30b9105b19ed7f1072f87f984d849d 100644 (file)
--- a/IntelFrameworkModulePkg/Library/GraphicsLib/GraphicsLib.inf
+++ b/IntelFrameworkModulePkg/Library/GraphicsLib/GraphicsLib.inf
@@ -55,6 +55,6 @@
   gEfiGraphicsOutputProtocolGuid                # PROTOCOL ALWAYS_CONSUMED\r
   gEfiUgaDrawProtocolGuid                       # PROTOCOL ALWAYS_CONSUMED\r
   gEfiConsoleControlProtocolGuid                # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiFirmwareVolumeProtocolGuid                # PROTOCOL ALWAYS_CONSUMED\r
+  gEfiFirmwareVolume2ProtocolGuid                # PROTOCOL ALWAYS_CONSUMED\r
   gEfiOEMBadgingProtocolGuid                    # PROTOCOL ALWAYS_CONSUMED\r
 \r

diff --git a/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c b/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
index cb77d5fe0d566702e7e13eca6664e084394d25bd..2d08ccdeb4b50ef4ca33581792756ddb2713a24a 100644 (file)
--- a/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
+++ b/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
@@ -64,9 +64,9 @@ InternalReportStatusCode (
   IN EFI_STATUS_CODE_DATA     *Data     OPTIONAL\r
   )\r
 {\r
-  EFI_PEI_SERVICES  **PeiServices;\r
+  CONST EFI_PEI_SERVICES  **PeiServices;\r
 \r
-  PeiServices = GetPeiServicesTablePointer ();\r
+  PeiServices = (CONST EFI_PEI_SERVICES  **) GetPeiServicesTablePointer ();\r
   return (*PeiServices)->ReportStatusCode (\r
                            PeiServices,\r
                            Type,\r

diff --git a/IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/PciCfg2.c b/IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/PciCfg2.c
index 1cde2025aff79d67333940a914b4bb6799bc158a..2055db3f4504adfc4a2d1321ef28ad36b9192e5e 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/PciCfg2.c
+++ b/IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/PciCfg2.c
@@ -290,10 +290,10 @@ PeimInitializePciCfg (
   }\r
   \r
   if (!FeaturePcdGet (PcdPciCfgDisable)) {\r
-    Status = (**PeiServices).InstallPpi (PeiServices, &gPciCfgPpiList);\r
+    Status = (**PeiServices).InstallPpi ((CONST EFI_PEI_SERVICES **)PeiServices, &gPciCfgPpiList);\r
   } \r
   if (!FeaturePcdGet (PcdPciCfg2Disable)) {\r
-    Status = (**PeiServices).InstallPpi (PeiServices, &gPciCfg2PpiList);\r
+    Status = (**PeiServices).InstallPpi ((CONST EFI_PEI_SERVICES **)PeiServices, &gPciCfg2PpiList);\r
   }\r
 \r
   return Status;\r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c
index 7c0fdc6077c382d5ff5c5b8016df149832fc6891..03f25c8fc6c8a99efda4de48852064f9fe0a7ad0 100644 (file)
--- 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\r
 EFIAPI\r
 ReportDispatcher (\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 OPTIONAL,\r
-  IN EFI_STATUS_CODE_DATA     *Data OPTIONAL\r
+  IN CONST EFI_GUID                 *CallerId OPTIONAL,\r
+  IN CONST EFI_STATUS_CODE_DATA     *Data OPTIONAL\r
   )\r
 {\r
   if (FeaturePcdGet (PcdStatusCodeUseSerial)) {\r
@@ -89,8 +89,8 @@ ReportDispatcher (
       CodeType,\r
       Value,\r
       Instance,\r
-      CallerId,\r
-      Data\r
+      (EFI_GUID *)CallerId,\r
+      (EFI_STATUS_CODE_DATA *)Data\r
       );\r
   }\r
 \r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.h b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.h
index 8cf6fd5f7fada102a12fc91095c97ba972cf7b4f..c7350d86ad04f430d0549b2dcaf8cb7f87e8b845 100644 (file)
--- 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,\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
@@ -147,12 +147,12 @@ MemoryStatusCodeReportWorker (
 EFI_STATUS\r
 EFIAPI\r
 ReportDispatcher (\r
-  IN EFI_PEI_SERVICES         **PeiServices,\r
+  IN CONST EFI_PEI_SERVICES         **PeiServices,\r
   IN EFI_STATUS_CODE_TYPE     Type,\r
   IN EFI_STATUS_CODE_VALUE    Value,\r
   IN UINT32                   Instance,\r
-  IN EFI_GUID                 *CallerId OPTIONAL,\r
-  IN EFI_STATUS_CODE_DATA     *Data OPTIONAL\r
+  IN CONST EFI_GUID                 *CallerId OPTIONAL,\r
+  IN CONST EFI_STATUS_CODE_DATA     *Data OPTIONAL\r
   );\r
 \r
 #endif\r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/SerialStatusCodeWorker.c b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/SerialStatusCodeWorker.c
index 36ff61c473a7b0750451df6fbe6d75f0756bd467..a23eca0049b45ee67bff2100a5faa74132c2005c 100644 (file)
--- 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,\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
   CHAR8           *Filename;\r

diff --git a/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c b/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c
index 6ace035003bcab0eeb8d53e91e699b043baa4947..46c898609a85760168fe6a4b499b0f154e6dd0cf 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c
+++ b/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c
@@ -76,7 +76,7 @@ Returns:
   //\r
   // Publish the variable capability to other modules\r
   //\r
-  return (**PeiServices).InstallPpi (PeiServices, &mPpiListVariable[0]);\r
+  return (**PeiServices).InstallPpi ((CONST EFI_PEI_SERVICES **) PeiServices, &mPpiListVariable[0]);\r
 \r
 }\r
 \r