Removed IntelframeworkPkg contamination from MdeModulePkg modules.

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

diff --git a/MdeModulePkg/Universal/VariablePei/Variable.h b/MdeModulePkg/Universal/VariablePei/Variable.h
index 5cebff818c0d1bfaff41ac8fd86fa9f96b7e04cb..9747a8d4264a492cbcf92452b75a8ce06d22282c 100644 (file)
--- a/MdeModulePkg/Universal/VariablePei/Variable.h
+++ b/MdeModulePkg/Universal/VariablePei/Variable.h
@@ -22,11 +22,20 @@ Abstract:
 #ifndef _PEI_VARIABLE_H\r
 #define _PEI_VARIABLE_H\r
 \r
+#include <PiPei.h>\r
+#include <Ppi/ReadOnlyVariable2.h>\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
+#include <Library/PeiServicesTablePointerLib.h>\r
+\r
+\r
 //\r
 // BugBug: We need relcate the head file.\r
 //\r
 #include <Common/Variable.h>\r
-#include <VarMachine.h>\r
 \r
 //\r
 // Define GET_PAD_SIZE to optimize compiler\r
@@ -92,12 +101,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
@@ -124,10 +133,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