MdeModulePkg Variable: Abstract GetHobVariableStore function

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

diff --git a/MdeModulePkg/Universal/Variable/Pei/Variable.c b/MdeModulePkg/Universal/Variable/Pei/Variable.c
index a072c31e60e74c89683503e5716cf6dd32f40ea2..1bcab3b770a5d4d3b40365601e5424d14f6e8100 100644 (file)
--- a/MdeModulePkg/Universal/Variable/Pei/Variable.c
+++ b/MdeModulePkg/Universal/Variable/Pei/Variable.c
@@ -2,7 +2,7 @@
   Implement ReadOnly Variable Services required by PEIM and install\r
   PEI ReadOnly Varaiable2 PPI. These services operates the non volatile storage space.\r
 \r
-Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, 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
@@ -495,6 +495,31 @@ CompareWithValidVariable (
   return EFI_NOT_FOUND;\r
 }\r
 \r
+/**\r
+  Get HOB variable store.\r
+\r
+**/\r
+VOID\r
+GetHobVariableStore (\r
+  OUT VARIABLE_STORE_INFO        *StoreInfo,\r
+  OUT VARIABLE_STORE_HEADER      **VariableStoreHeader\r
+  )\r
+{\r
+  EFI_HOB_GUID_TYPE              *GuidHob;\r
+\r
+  GuidHob = GetFirstGuidHob (&gEfiAuthenticatedVariableGuid);\r
+  if (GuidHob != NULL) {\r
+    *VariableStoreHeader = (VARIABLE_STORE_HEADER *) GET_GUID_HOB_DATA (GuidHob);\r
+    StoreInfo->AuthFlag = TRUE;\r
+  } else {\r
+    GuidHob = GetFirstGuidHob (&gEfiVariableGuid);\r
+    if (GuidHob != NULL) {\r
+      *VariableStoreHeader = (VARIABLE_STORE_HEADER *) GET_GUID_HOB_DATA (GuidHob);\r
+      StoreInfo->AuthFlag = FALSE;\r
+    }\r
+  }\r
+}\r
+\r
 /**\r
   Return the variable store header and the store info based on the Index.\r
 \r
@@ -523,17 +548,8 @@ GetVariableStore (
   VariableStoreHeader = NULL;\r
   switch (Type) {\r
     case VariableStoreTypeHob:\r
-      GuidHob = GetFirstGuidHob (&gEfiAuthenticatedVariableGuid);\r
-      if (GuidHob != NULL) {\r
-        VariableStoreHeader = (VARIABLE_STORE_HEADER *) GET_GUID_HOB_DATA (GuidHob);\r
-        StoreInfo->AuthFlag = TRUE;\r
-      } else {\r
-        GuidHob = GetFirstGuidHob (&gEfiVariableGuid);\r
-        if (GuidHob != NULL) {\r
-          VariableStoreHeader = (VARIABLE_STORE_HEADER *) GET_GUID_HOB_DATA (GuidHob);\r
-          StoreInfo->AuthFlag = FALSE;\r
-        }\r
-      }\r
+      GetHobVariableStore (StoreInfo, &VariableStoreHeader);\r
+\r
       break;\r
 \r
     case VariableStoreTypeNv:\r
@@ -947,9 +963,10 @@ FindVariable (
   @param  DataSize              On entry, points to the size in bytes of the Data buffer.\r
                                 On return, points to the size of the data returned in Data.\r
   @param  Data                  Points to the buffer which will hold the returned variable value.\r
+                                May be NULL with a zero DataSize in order to determine the size of the buffer needed.\r
 \r
   @retval EFI_SUCCESS           The variable was read successfully.\r
-  @retval EFI_NOT_FOUND         The variable could not be found.\r
+  @retval EFI_NOT_FOUND         The variable was be found.\r
   @retval EFI_BUFFER_TOO_SMALL  The DataSize is too small for the resulting data.\r
                                 DataSize is updated with the size required for\r
                                 the specified variable.\r
@@ -965,7 +982,7 @@ PeiGetVariable (
   IN CONST  EFI_GUID                        *VariableGuid,\r
   OUT       UINT32                          *Attributes,\r
   IN OUT    UINTN                           *DataSize,\r
-  OUT       VOID                            *Data\r
+  OUT       VOID                            *Data OPTIONAL\r
   )\r
 {\r
   VARIABLE_POINTER_TRACK  Variable;\r