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 e2f3c4bdddf6d00bd310e90aea7a17bb5a80877d..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
@@ -50,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
@@ -192,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
@@ -209,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
@@ -265,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
@@ -277,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,7 +302,7 @@ Returns:
       VariableBase = (UINT8 *) (UINTN) PcdGet32 (PcdFlashNvStorageVariableBase);\r
       VariableStoreHeader = (VARIABLE_STORE_HEADER *) (VariableBase + \\r
                             ((EFI_FIRMWARE_VOLUME_HEADER *) (VariableBase)) -> HeaderLength);\r
-      \r
+\r
       if (GetVariableStoreStatus (VariableStoreHeader) != EfiValid) {\r
         return EFI_UNSUPPORTED;\r
       }\r
@@ -342,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