Update PEIM entry point to follow PEIM entry point.

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

diff --git a/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c b/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c
index f57e2002e262af50ea6d43e8f4a107ff0205e67c..33363e67eaed69ae7deb920b7b8e741e1d7fac9c 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c
+++ b/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c
@@ -19,17 +19,17 @@ Module Name:
 //\r
 // Module globals\r
 //\r
-static EFI_PEI_READ_ONLY_VARIABLE_PPI mVariablePpi = {\r
+EFI_PEI_READ_ONLY_VARIABLE_PPI mVariablePpi = {\r
   PeiGetVariable,\r
   PeiGetNextVariableName\r
 };\r
 \r
-static EFI_PEI_READ_ONLY_VARIABLE2_PPI mVariable2Ppi = {\r
+EFI_PEI_READ_ONLY_VARIABLE2_PPI mVariable2Ppi = {\r
   PeiGetVariable2,\r
   PeiGetNextVariableName2\r
 };\r
 \r
-static EFI_PEI_PPI_DESCRIPTOR     mPpiListVariable[] = {\r
+EFI_PEI_PPI_DESCRIPTOR     mPpiListVariable[] = {\r
   {\r
     (EFI_PEI_PPI_DESCRIPTOR_PPI),\r
     &gEfiPeiReadOnlyVariable2PpiGuid,\r
@@ -47,8 +47,8 @@ EFI_GUID mEfiVariableIndexTableGuid = EFI_VARIABLE_INDEX_TABLE_GUID;
 /**\r
   Provide the functionality of the variable services.\r
 \r
-  @param FfsHeadher  - The FFS file header\r
-  @param PeiServices - General purpose services available to every PEIM.\r
+  @param  FileHandle  Handle of the file being invoked.\r
+  @param  PeiServices Describes the list of possible PEI Services.\r
 \r
   @return Status -  EFI_SUCCESS if the interface could be successfully\r
           installed\r
@@ -57,14 +57,14 @@ EFI_GUID mEfiVariableIndexTableGuid = EFI_VARIABLE_INDEX_TABLE_GUID;
 EFI_STATUS\r
 EFIAPI\r
 PeimInitializeVariableServices (\r
-  IN EFI_FFS_FILE_HEADER       *FfsHeader,\r
-  IN EFI_PEI_SERVICES          **PeiServices\r
+  IN       EFI_PEI_FILE_HANDLE  FileHandle,\r
+  IN CONST EFI_PEI_SERVICES     **PeiServices\r
   )\r
 {\r
   //\r
   // Publish the variable capability to other modules\r
   //\r
-  return (**PeiServices).InstallPpi ((CONST EFI_PEI_SERVICES **) PeiServices, &mPpiListVariable[0]);\r
+  return (**PeiServices).InstallPpi (PeiServices, &mPpiListVariable[0]);\r
 \r
 }\r
 \r
@@ -73,7 +73,7 @@ PeimInitializeVariableServices (
 \r
   @param VarStoreHeader        Pointer to the Variable Store Header.\r
 \r
-  @Return VARIABLE_HEADER*      Pointer to last unavailable Variable Header\r
+  @return VARIABLE_HEADER*      Pointer to last unavailable Variable Header\r
 \r
 **/\r
 VARIABLE_HEADER *\r
@@ -92,7 +92,7 @@ GetStartPointer (
 \r
   @param VarStoreHeader        Pointer to the Variable Store Header.\r
 \r
-  @Return  VARIABLE_HEADER*      Pointer to last unavailable Variable Header\r
+  @return  VARIABLE_HEADER*      Pointer to last unavailable Variable Header\r
 \r
 **/\r
 VARIABLE_HEADER *\r
@@ -117,7 +117,6 @@ GetEndPointer (
   @retval FALSE           Variable header is not valid.\r
 \r
 **/\r
-STATIC\r
 BOOLEAN\r
 EFIAPI\r
 IsValidVariableHeader (\r
@@ -136,7 +135,7 @@ IsValidVariableHeader (
 \r
   @param Variable            Pointer to the Variable Header.\r
 \r
-  @Return UINTN               Size of variable in bytes\r
+  @return UINTN               Size of variable in bytes\r
 \r
 **/\r
 UINTN\r
@@ -158,7 +157,7 @@ NameSizeOfVariable (
 \r
   @param Variable            Pointer to the Variable Header.\r
 \r
-  @Return  UINTN               Size of variable in bytes\r
+  @return  UINTN               Size of variable in bytes\r
 \r
 **/\r
 UINTN\r
@@ -180,7 +179,7 @@ DataSizeOfVariable (
 \r
   @param Variable            Pointer to the Variable Header.\r
 \r
-  @Return CHAR16*              Pointer to Variable Name\r
+  @return CHAR16*              Pointer to Variable Name\r
 \r
 **/\r
 CHAR16 *\r
@@ -198,7 +197,7 @@ GetVariableNamePtr (
 \r
   @param Variable            Pointer to the Variable Header.\r
 \r
-  @Return  UINT8*              Pointer to Variable Data\r
+  @return  UINT8*              Pointer to Variable Data\r
 \r
 **/\r
 UINT8 *\r
@@ -223,7 +222,7 @@ GetVariableDataPtr (
 \r
   @param Variable              Pointer to the Variable Header.\r
 \r
-  @Return VARIABLE_HEADER*      Pointer to next variable header.\r
+  @return VARIABLE_HEADER*      Pointer to next variable header.\r
 \r
 **/\r
 VARIABLE_HEADER *\r
@@ -258,7 +257,6 @@ GetNextVariablePtr (
   @retval EfiInvalid    Variable store is invalid\r
 \r
 **/\r
-STATIC\r
 VARIABLE_STORE_STATUS\r
 EFIAPI\r
 GetVariableStoreStatus (\r
@@ -295,11 +293,10 @@ GetVariableStoreStatus (
   @param PtrTrack       - Variable Track Pointer structure that contains\r
                    Variable Information.\r
 \r
-  @Retval  EFI_SUCCESS    - Found match variable\r
+  @retval  EFI_SUCCESS    - Found match variable\r
   @retval EFI_NOT_FOUND  - Variable not found\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 CompareWithValidVariable (\r
   IN  VARIABLE_HEADER               *Variable,\r
@@ -351,11 +348,10 @@ CompareWithValidVariable (
   @retval EFI_INVALID_PARAMETER  - Invalid variable name\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 FindVariable (\r
-  IN EFI_PEI_SERVICES         **PeiServices,\r
+  IN        EFI_PEI_SERVICES   **PeiServices,\r
   IN CONST  CHAR16            *VariableName,\r
   IN CONST  EFI_GUID          *VendorGuid,\r
   OUT VARIABLE_POINTER_TRACK  *PtrTrack\r
@@ -581,7 +577,7 @@ PeiGetVariable2 (
 \r
 {\r
   return PeiGetVariable (\r
-           GetPeiServicesTablePointer (),\r
+           (EFI_PEI_SERVICES **) GetPeiServicesTablePointer (),\r
            (CHAR16*)VariableName,\r
            (EFI_GUID*)VariableGuid,\r
            Attributes,\r
@@ -703,7 +699,7 @@ PeiGetNextVariableName2 (
 \r
 {\r
   return PeiGetNextVariableName (\r
-           GetPeiServicesTablePointer (),\r
+           (EFI_PEI_SERVICES **) GetPeiServicesTablePointer (),\r
            VariableNameSize,\r
            VariableName,\r
            VariableGuid\r