Removed IntelframeworkPkg contamination from MdeModulePkg modules.

[mirror_edk2.git] / MdeModulePkg / Universal / VariablePei / Variable.c

diff --git a/MdeModulePkg/Universal/VariablePei/Variable.c b/MdeModulePkg/Universal/VariablePei/Variable.c
index b56e315e691933359b3d4533d451351a855cf1d6..ba8a23d67a509197b801266cb59ca6322bcc0b2e 100644 (file)
--- a/MdeModulePkg/Universal/VariablePei/Variable.c
+++ b/MdeModulePkg/Universal/VariablePei/Variable.c
@@ -18,38 +18,20 @@ Abstract:
 \r
 --*/\r
 \r
-//\r
-// The package level header files this module uses\r
-//\r
-#include <PiPei.h>\r
 \r
-//\r
-// The protocols, PPI and GUID defintions for this module\r
-//\r
-#include <Ppi/ReadOnlyVariable.h>\r
-//\r
-// The Library classes this module consumes\r
-//\r
-#include <Library/DebugLib.h>\r
-#include <Library/PeimEntryPoint.h>\r
-#include <Library/HobLib.h>\r
-#include <Library/PcdLib.h>\r
-#include <Library/BaseMemoryLib.h>\r
-\r
-\r
-#include <Variable.h>\r
+#include "Variable.h"\r
 \r
 //\r
 // Module globals\r
 //\r
-static EFI_PEI_READ_ONLY_VARIABLE_PPI mVariablePpi = {\r
+static EFI_PEI_READ_ONLY_VARIABLE2_PPI mVariablePpi = {\r
   PeiGetVariable,\r
   PeiGetNextVariableName\r
 };\r
 \r
 static EFI_PEI_PPI_DESCRIPTOR     mPpiListVariable = {\r
   (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),\r
-  &gEfiPeiReadOnlyVariablePpiGuid,\r
+  &gEfiPeiReadOnlyVariable2PpiGuid,\r
   &mVariablePpi\r
 };\r
 \r
@@ -187,10 +169,10 @@ Returns:
 STATIC\r
 EFI_STATUS\r
 CompareWithValidVariable (\r
-  IN  VARIABLE_HEADER         *Variable,\r
-  IN  CHAR16                  *VariableName,\r
-  IN  EFI_GUID                *VendorGuid,\r
-  OUT VARIABLE_POINTER_TRACK  *PtrTrack\r
+  IN  VARIABLE_HEADER               *Variable,\r
+  IN  CONST CHAR16                  *VariableName,\r
+  IN  CONST EFI_GUID                *VendorGuid,\r
+  OUT VARIABLE_POINTER_TRACK        *PtrTrack\r
   )\r
 /*++\r
 \r
@@ -242,8 +224,8 @@ EFI_STATUS
 EFIAPI\r
 FindVariable (\r
   IN EFI_PEI_SERVICES         **PeiServices,\r
-  IN  CHAR16                  *VariableName,\r
-  IN  EFI_GUID                *VendorGuid,\r
+  IN CONST  CHAR16            *VariableName,\r
+  IN CONST  EFI_GUID          *VendorGuid,\r
   OUT VARIABLE_POINTER_TRACK  *PtrTrack\r
   )\r
 /*++\r
@@ -380,12 +362,12 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 PeiGetVariable (\r
-  IN EFI_PEI_SERVICES             **PeiServices,\r
-  IN CHAR16                       *VariableName,\r
-  IN EFI_GUID                     * VendorGuid,\r
-  OUT UINT32                      *Attributes OPTIONAL,\r
-  IN OUT UINTN                    *DataSize,\r
-  OUT VOID                        *Data\r
+  IN CONST  EFI_PEI_READ_ONLY_VARIABLE2_PPI *This,\r
+  IN CONST  CHAR16                          *VariableName,\r
+  IN CONST  EFI_GUID                        *VariableGuid,\r
+  OUT       UINT32                          *Attributes,\r
+  IN OUT    UINTN                           *DataSize,\r
+  OUT       VOID                            *Data\r
   )\r
 /*++\r
 \r
@@ -420,15 +402,16 @@ Returns:
   VARIABLE_POINTER_TRACK  Variable;\r
   UINTN                   VarDataSize;\r
   EFI_STATUS              Status;\r
+  EFI_PEI_SERVICES        **PeiServices;\r
 \r
-  if (VariableName == NULL || VendorGuid == NULL) {\r
+  PeiServices = GetPeiServicesTablePointer ();\r
+  if (VariableName == NULL || VariableGuid == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   //\r
   // Find existing variable\r
   //\r
-  Status = FindVariable (PeiServices, VariableName, VendorGuid, &Variable);\r
-\r
+  Status = FindVariable (PeiServices, VariableName, VariableGuid, &Variable);\r
   if (Variable.CurrPtr == NULL || Status != EFI_SUCCESS) {\r
     return Status;\r
   }\r
@@ -454,10 +437,10 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 PeiGetNextVariableName (\r
-  IN EFI_PEI_SERVICES             **PeiServices,\r
-  IN OUT UINTN                    *VariableNameSize,\r
-  IN OUT CHAR16                   *VariableName,\r
-  IN OUT EFI_GUID                 *VendorGuid\r
+  IN CONST  EFI_PEI_READ_ONLY_VARIABLE2_PPI *This,\r
+  IN OUT UINTN                              *VariableNameSize,\r
+  IN OUT CHAR16                             *VariableName,\r
+  IN OUT EFI_GUID                           *VariableGuid\r
   )\r
 /*++\r
 \r
@@ -470,7 +453,7 @@ Arguments:
   PeiServices        - General purpose services available to every PEIM.\r
   VariabvleNameSize  - The variable name's size.\r
   VariableName       - A pointer to the variable's name.\r
-  VendorGuid         - A pointer to the EFI_GUID structure.\r
+  VariableGuid       - A pointer to the EFI_GUID structure.\r
 \r
   VariableNameSize - Size of the variable name\r
 \r
@@ -489,13 +472,14 @@ Returns:
   VARIABLE_POINTER_TRACK  Variable;\r
   UINTN                   VarNameSize;\r
   EFI_STATUS              Status;\r
+  EFI_PEI_SERVICES        **PeiServices;\r
 \r
+  PeiServices = GetPeiServicesTablePointer ();\r
   if (VariableName == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Status = FindVariable (PeiServices, VariableName, VendorGuid, &Variable);\r
-\r
+  Status = FindVariable (PeiServices, VariableName, VariableGuid, &Variable);\r
   if (Variable.CurrPtr == NULL || Status != EFI_SUCCESS) {\r
     return Status;\r
   }\r
@@ -514,7 +498,7 @@ Returns:
         if (VarNameSize <= *VariableNameSize) {\r
           (*PeiServices)->CopyMem (VariableName, GET_VARIABLE_NAME_PTR (Variable.CurrPtr), VarNameSize);\r
 \r
-          (*PeiServices)->CopyMem (VendorGuid, &Variable.CurrPtr->VendorGuid, sizeof (EFI_GUID));\r
+          (*PeiServices)->CopyMem (VariableGuid, &Variable.CurrPtr->VendorGuid, sizeof (EFI_GUID));\r
 \r
           Status = EFI_SUCCESS;\r
         } else {\r