MdeModulePkg Variable: Align TPL level for (Smm)EndOfDxe callback

[mirror_edk2.git] / MdeModulePkg / Universal / Variable / EmuRuntimeDxe / InitVariable.c

diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/InitVariable.c b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/InitVariable.c
index 2aa3e28853d74b8ad77bf17f87fe5598eaf37fe3..309a4b8dbfeb61e8b2e599b0a7dcd7aa1c6dc826 100644 (file)
--- a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/InitVariable.c
+++ b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/InitVariable.c
@@ -3,8 +3,8 @@
   Implment all four UEFI runtime variable services and \r
   install variable architeture protocol.\r
   \r
-Copyright (c) 2006 - 2008, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
+Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 http://opensource.org/licenses/bsd-license.php\r
@@ -27,7 +27,8 @@ EFI_EVENT   mVirtualAddressChangeEvent = NULL;
   @param Attributes                 Attribute value of the variable found.\r
   @param DataSize                   Size of Data found. If size is less than the\r
                                     data, this value contains the required size.\r
-  @param Data                       Data pointer.\r
+  @param Data                       The buffer to return the contents of the variable. May be NULL\r
+                                    with a zero DataSize in order to determine the size buffer needed.\r
                       \r
   @return EFI_INVALID_PARAMETER     Invalid parameter\r
   @return EFI_SUCCESS               Find the specified variable\r
@@ -42,17 +43,16 @@ RuntimeServiceGetVariable (
   IN EFI_GUID      *VendorGuid,\r
   OUT UINT32       *Attributes OPTIONAL,\r
   IN OUT UINTN     *DataSize,\r
-  OUT VOID         *Data\r
+  OUT VOID         *Data OPTIONAL\r
   )\r
 {\r
-  return GetVariable (\r
+  return EmuGetVariable (\r
           VariableName,\r
           VendorGuid,\r
           Attributes OPTIONAL,\r
           DataSize,\r
           Data,\r
-          &mVariableModuleGlobal->VariableGlobal[Physical],\r
-          mVariableModuleGlobal->FvbInstance\r
+          &mVariableModuleGlobal->VariableGlobal[Physical]\r
           );\r
 }\r
 \r
@@ -60,14 +60,22 @@ RuntimeServiceGetVariable (
 \r
   This code Finds the Next available variable.\r
 \r
-  @param VariableNameSize           Size of the variable name\r
-  @param VariableName               Pointer to variable name\r
-  @param VendorGuid                 Variable Vendor Guid\r
-\r
-  @return EFI_INVALID_PARAMETER     Invalid parameter\r
-  @return EFI_SUCCESS               Find the specified variable\r
-  @return EFI_NOT_FOUND             Not found\r
-  @return EFI_BUFFER_TO_SMALL       DataSize is too small for the result\r
+  @param  VariableNameSize       The size of the VariableName buffer. The size must be large enough to fit input\r
+                                 string supplied in VariableName buffer.\r
+  @param  VariableName           On input, supplies the last VariableName that was returned by GetNextVariableName().\r
+                                 On output, returns the Null-terminated Unicode string of the current variable.\r
+  @param  VendorGuid             On input, supplies the last VendorGuid that was returned by GetNextVariableName().\r
+                                 On output, returns the VendorGuid of the current variable.\r
+\r
+  @retval EFI_SUCCESS            The function completed successfully.\r
+  @retval EFI_NOT_FOUND          The next variable was not found.\r
+  @retval EFI_BUFFER_TOO_SMALL   The VariableNameSize is too small for the result.\r
+                                 VariableNameSize has been updated with the size needed to complete the request.\r
+  @retval EFI_INVALID_PARAMETER  VariableNameSize or VariableName or VendorGuid is NULL.\r
+  @retval EFI_INVALID_PARAMETER  The input values of VariableName and VendorGuid are not a name and\r
+                                 GUID of an existing variable.\r
+  @retval EFI_INVALID_PARAMETER  Null-terminator is not found in the first VariableNameSize bytes of\r
+                                 the input VariableName buffer.\r
 \r
 **/\r
 EFI_STATUS\r
@@ -78,12 +86,11 @@ RuntimeServiceGetNextVariableName (
   IN OUT EFI_GUID  *VendorGuid\r
   )\r
 {\r
-  return GetNextVariableName (\r
+  return EmuGetNextVariableName (\r
           VariableNameSize,\r
           VariableName,\r
           VendorGuid,\r
-          &mVariableModuleGlobal->VariableGlobal[Physical],\r
-          mVariableModuleGlobal->FvbInstance\r
+          &mVariableModuleGlobal->VariableGlobal[Physical]\r
           );\r
 }\r
 \r
@@ -115,7 +122,7 @@ RuntimeServiceSetVariable (
   IN VOID          *Data\r
   )\r
 {\r
-  return SetVariable (\r
+  return EmuSetVariable (\r
           VariableName,\r
           VendorGuid,\r
           Attributes,\r
@@ -123,8 +130,7 @@ RuntimeServiceSetVariable (
           Data,\r
           &mVariableModuleGlobal->VariableGlobal[Physical],\r
           &mVariableModuleGlobal->VolatileLastVariableOffset,\r
-          &mVariableModuleGlobal->NonVolatileLastVariableOffset,\r
-          mVariableModuleGlobal->FvbInstance\r
+          &mVariableModuleGlobal->NonVolatileLastVariableOffset\r
           );\r
 }\r
 \r
@@ -155,13 +161,12 @@ RuntimeServiceQueryVariableInfo (
   OUT UINT64                 *MaximumVariableSize\r
   )\r
 {\r
-  return QueryVariableInfo (\r
+  return EmuQueryVariableInfo (\r
           Attributes,\r
           MaximumVariableStorageSize,\r
           RemainingVariableStorageSize,\r
           MaximumVariableSize,\r
-          &mVariableModuleGlobal->VariableGlobal[Physical],\r
-          mVariableModuleGlobal->FvbInstance\r
+          &mVariableModuleGlobal->VariableGlobal[Physical]\r
           );\r
 }\r
 \r
@@ -182,6 +187,9 @@ VariableClassAddressChangeEvent (
   IN VOID             *Context\r
   )\r
 {\r
+  EfiConvertPointer (0x0, (VOID **) &mVariableModuleGlobal->PlatformLangCodes);\r
+  EfiConvertPointer (0x0, (VOID **) &mVariableModuleGlobal->LangCodes);\r
+  EfiConvertPointer (0x0, (VOID **) &mVariableModuleGlobal->PlatformLang);\r
   EfiConvertPointer (\r
     0x0,\r
     (VOID **) &mVariableModuleGlobal->VariableGlobal[Physical].NonVolatileVariableBase\r
@@ -196,7 +204,7 @@ VariableClassAddressChangeEvent (
 /**\r
   EmuVariable Driver main entry point. The Variable driver places the 4 EFI\r
   runtime services in the EFI System Table and installs arch protocols \r
-  for variable read and write services being availible. It also registers\r
+  for variable read and write services being available. It also registers\r
   notification function for EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE event.\r
 \r
   @param[in] ImageHandle    The firmware allocated handle for the EFI image.  \r
@@ -237,11 +245,12 @@ VariableServiceInitialize (
                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  Status = gBS->CreateEvent (\r
-                  EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE,\r
+  Status = gBS->CreateEventEx (\r
+                  EVT_NOTIFY_SIGNAL,\r
                   TPL_NOTIFY,\r
                   VariableClassAddressChangeEvent,\r
                   NULL,\r
+                  &gEfiEventVirtualAddressChangeGuid,\r
                   &mVirtualAddressChangeEvent\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r