MdeModulePkg: Variable drivers robustly handle crashes during Reclaim().

[mirror_edk2.git] / MdeModulePkg / Universal / FaultTolerantWriteDxe / UpdateWorkingBlock.c

diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/UpdateWorkingBlock.c b/MdeModulePkg/Universal/FaultTolerantWriteDxe/UpdateWorkingBlock.c
index bd8285d00e1a842ebb74119ab6a919f83991a603..4c658b2977c4230def1d70df54b5fba390ab7765 100644 (file)
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/UpdateWorkingBlock.c
+++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/UpdateWorkingBlock.c
@@ -2,7 +2,7 @@
 \r
    Internal functions to operate Working Block Space.\r
 \r
-Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2013, 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
@@ -32,9 +32,9 @@ InitializeLocalWorkSpaceHeader (
   EFI_STATUS                              Status;\r
 \r
   //\r
-  // Check signature with gEfiSystemNvDataFvGuid.\r
+  // Check signature with gEdkiiWorkingBlockSignatureGuid.\r
   //\r
-  if (CompareGuid (&gEfiSystemNvDataFvGuid, &mWorkingBlockHeader.Signature)) {\r
+  if (CompareGuid (&gEdkiiWorkingBlockSignatureGuid, &mWorkingBlockHeader.Signature)) {\r
     //\r
     // The local work space header has been initialized.\r
     //\r
@@ -48,11 +48,11 @@ InitializeLocalWorkSpaceHeader (
     );\r
 \r
   //\r
-  // Here using gEfiSystemNvDataFvGuid as the signature.\r
+  // Here using gEdkiiWorkingBlockSignatureGuid as the signature.\r
   //\r
   CopyMem (\r
     &mWorkingBlockHeader.Signature,\r
-    &gEfiSystemNvDataFvGuid,\r
+    &gEdkiiWorkingBlockSignatureGuid,\r
     sizeof (EFI_GUID)\r
     );\r
   mWorkingBlockHeader.WriteQueueSize = (UINT64) (PcdGet32 (PcdFlashNvStorageFtwWorkingSize) - sizeof (EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER));\r
@@ -322,7 +322,7 @@ FtwReclaimWorkSpace (
       CopyMem (\r
         Ptr + sizeof (EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER),\r
         FtwDevice->FtwLastWriteHeader,\r
-        WRITE_TOTAL_SIZE (Header->NumberOfWrites, Header->PrivateDataSize)\r
+        FTW_WRITE_TOTAL_SIZE (Header->NumberOfWrites, Header->PrivateDataSize)\r
         );\r
     }\r
   }\r