1. Removed #ifdef SNP_DEBUG and used debug lib to output information

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

diff --git a/EdkModulePkg/Universal/Variable/Pei/Variable.c b/EdkModulePkg/Universal/Variable/Pei/Variable.c
index b2286c18604f3f884b52cf26c1285893fcfad9ed..06604195478b1ad29480d0b9754117815f6cccd9 100644 (file)
--- a/EdkModulePkg/Universal/Variable/Pei/Variable.c
+++ b/EdkModulePkg/Universal/Variable/Pei/Variable.c
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2006, Intel Corporation                                                         \r
+Copyright (c) 2006 - 2007 Intel Corporation. <BR>\r
 All rights reserved. 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
@@ -8,7 +8,6 @@ http://opensource.org/licenses/bsd-license.php
                                                                                           \r
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
-\r
 Module Name:\r
 \r
   Variable.c\r
@@ -19,10 +18,7 @@ Abstract:
 \r
 --*/\r
 \r
-\r
-#include <Ppi/ReadOnlyVariable.h>\r
 #include <Variable.h>\r
-#include <Library/BaseLib.h>\r
 \r
 //\r
 // Module globals\r
@@ -53,7 +49,7 @@ Routine Description:
   Provide the functionality of the variable services.\r
 \r
 Arguments:\r
-  \r
+\r
   FfsHeadher  - The FFS file header\r
   PeiServices - General purpose services available to every PEIM.\r
 \r
@@ -71,6 +67,7 @@ Returns:
 \r
 }\r
 \r
+STATIC\r
 VARIABLE_HEADER *\r
 GetNextVariablePtr (\r
   IN VARIABLE_HEADER  *Variable\r
@@ -93,6 +90,7 @@ Returns:
   return (VARIABLE_HEADER *) ((UINTN) GET_VARIABLE_DATA_PTR (Variable) + Variable->DataSize + GET_PAD_SIZE (Variable->DataSize));\r
 }\r
 \r
+STATIC\r
 BOOLEAN\r
 EFIAPI\r
 IsValidVariableHeader (\r
@@ -123,6 +121,7 @@ Returns:
   return TRUE;\r
 }\r
 \r
+STATIC\r
 VARIABLE_STORE_STATUS\r
 EFIAPI\r
 GetVariableStoreStatus (\r
@@ -166,6 +165,7 @@ Returns:
   }\r
 }\r
 \r
+STATIC\r
 EFI_STATUS\r
 CompareWithValidVariable (\r
   IN  VARIABLE_HEADER         *Variable,\r
@@ -191,7 +191,7 @@ Returns:
 \r
   EFI_SUCCESS    - Found match variable\r
   EFI_NOT_FOUND  - Variable not found\r
- \r
+\r
 --*/\r
 {\r
   if (VariableName[0] == 0) {\r
@@ -208,7 +208,7 @@ Returns:
         (((INT32 *) VendorGuid)[2] == ((INT32 *) &Variable->VendorGuid)[2]) &&\r
         (((INT32 *) VendorGuid)[3] == ((INT32 *) &Variable->VendorGuid)[3])\r
         ) {\r
-      if (!StrCmp (VariableName, GET_VARIABLE_NAME_PTR (Variable))) {\r
+      if (!CompareMem (VariableName, GET_VARIABLE_NAME_PTR (Variable), Variable->NameSize)) {\r
         PtrTrack->CurrPtr = Variable;\r
         return EFI_SUCCESS;\r
       }\r
@@ -218,6 +218,7 @@ Returns:
   return EFI_NOT_FOUND;\r
 }\r
 \r
+STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 FindVariable (\r
@@ -248,18 +249,13 @@ Returns:
 \r
 --*/\r
 {\r
-  PEI_FLASH_MAP_PPI       *FlashMapPpi;\r
-  EFI_FLASH_SUBAREA_ENTRY *VariableStoreEntry;\r
-  UINT32                  NumEntries;\r
   EFI_HOB_GUID_TYPE       *GuidHob;\r
   VARIABLE_STORE_HEADER   *VariableStoreHeader;\r
   VARIABLE_HEADER         *Variable;\r
-\r
-  EFI_STATUS              Status;\r
-\r
   VARIABLE_HEADER         *MaxIndex;\r
   VARIABLE_INDEX_TABLE    *IndexTable;\r
   UINT32                  Count;\r
+  UINT8                   *VariableBase;\r
 \r
   if (VariableName != 0 && VendorGuid == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -268,7 +264,7 @@ Returns:
   // No Variable Address equals zero, so 0 as initial value is safe.\r
   //\r
   MaxIndex = 0;\r
-  \r
+\r
   GuidHob = GetFirstGuidHob (&gEfiVariableIndexTableGuid);\r
   if (GuidHob == NULL) {\r
     IndexTable = BuildGuidHob (&gEfiVariableIndexTableGuid, sizeof (VARIABLE_INDEX_TABLE));\r
@@ -280,13 +276,8 @@ Returns:
     IndexTable = GET_GUID_HOB_DATA (GuidHob);\r
     for (Count = 0; Count < IndexTable->Length; Count++)\r
     {\r
-#if ALIGNMENT <= 1\r
-      MaxIndex = (VARIABLE_HEADER *) (UINTN) (IndexTable->Index[Count] + ((UINTN) IndexTable->StartPtr & 0xFFFF0000));\r
-#else\r
-#if ALIGNMENT >= 4\r
-          MaxIndex = (VARIABLE_HEADER *) (UINTN) ((((UINT32)IndexTable->Index[Count]) << 2) + ((UINT32)(UINTN)IndexTable->StartPtr & 0xFFFC0000) );       \r
-#endif\r
-#endif\r
+      MaxIndex = GetVariableByIndex (IndexTable, Count);\r
+\r
       if (CompareWithValidVariable (MaxIndex, VariableName, VendorGuid, PtrTrack) == EFI_SUCCESS) {\r
         PtrTrack->StartPtr  = IndexTable->StartPtr;\r
         PtrTrack->EndPtr    = IndexTable->EndPtr;\r
@@ -308,38 +299,9 @@ Returns:
     if (IndexTable->StartPtr || IndexTable->EndPtr) {\r
       Variable = IndexTable->StartPtr;\r
     } else {\r
-      //\r
-      // Locate FlashMap PPI\r
-      //\r
-      Status = (**PeiServices).LocatePpi (\r
-                                PeiServices,\r
-                                &gPeiFlashMapPpiGuid,\r
-                                0,\r
-                                NULL,\r
-                                (VOID **) &FlashMapPpi\r
-                                );\r
-      ASSERT_EFI_ERROR (Status);\r
-\r
-      //\r
-      // Get flash area info for variables\r
-      //\r
-      Status = FlashMapPpi->GetAreaInfo (\r
-                              PeiServices,\r
-                              FlashMapPpi,\r
-                              EFI_FLASH_AREA_EFI_VARIABLES,\r
-                              NULL,\r
-                              &NumEntries,\r
-                              &VariableStoreEntry\r
-                              );\r
-\r
-      //\r
-      //  Currently only one non-volatile variable store is supported\r
-      //\r
-      if (NumEntries != 1) {\r
-        return EFI_UNSUPPORTED;\r
-      }\r
-\r
-      VariableStoreHeader = (VARIABLE_STORE_HEADER *) (UINTN) (VariableStoreEntry->Base);\r
+      VariableBase = (UINT8 *) (UINTN) PcdGet32 (PcdFlashNvStorageVariableBase);\r
+      VariableStoreHeader = (VARIABLE_STORE_HEADER *) (VariableBase + \\r
+                            ((EFI_FIRMWARE_VOLUME_HEADER *) (VariableBase)) -> HeaderLength);\r
 \r
       if (GetVariableStoreStatus (VariableStoreHeader) != EfiValid) {\r
         return EFI_UNSUPPORTED;\r
@@ -374,13 +336,7 @@ Returns:
       //\r
       if (IndexTable->Length < VARIABLE_INDEX_TABLE_VOLUME)\r
       {\r
-#if ALIGNMENT <= 1\r
-        IndexTable->Index[IndexTable->Length++] = (UINT16) (UINTN) Variable;\r
-#else\r
-#if ALIGNMENT >= 4\r
-            IndexTable->Index[IndexTable->Length++] = (UINT16) (((UINT32)(UINTN) Variable) >> 2);\r
-#endif\r
-#endif\r
+        VariableIndexTableUpdate (IndexTable, Variable);\r
       }\r
 \r
       if (CompareWithValidVariable (Variable, VariableName, VendorGuid, PtrTrack) == EFI_SUCCESS) {\r