Clean up FaultTolerantWriteDxe to remove the duplicated definition.

[mirror_edk2.git] / MdeModulePkg / Universal / FirmwareVolume / FaultTolerantWriteDxe / FtwWorkSpace.c

diff --git a/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwWorkSpace.c b/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwWorkSpace.c
index 6474c2d0a5846309c80b125900aac369023a3f3b..1dae0d6b56d17197d3372dd09dd9af0fd68f6208 100644 (file)
--- a/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwWorkSpace.c
+++ b/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwWorkSpace.c
@@ -36,12 +36,14 @@ IsValidWorkSpace (
 \r
   ASSERT (WorkingHeader != NULL);\r
   if (WorkingHeader->WorkingBlockValid != FTW_VALID_STATE) {\r
+    DEBUG ((EFI_D_ERROR, "FtwLite: Work block header valid bit check error\n"));\r
     return FALSE;\r
   }\r
   //\r
   // Check signature with gEfiSystemNvDataFvGuid\r
   //\r
   if (!CompareGuid (&gEfiSystemNvDataFvGuid, &WorkingHeader->Signature)) {\r
+    DEBUG ((EFI_D_ERROR, "FtwLite: Work block header signature check error\n"));\r
     return FALSE;\r
   }\r
   //\r
@@ -75,7 +77,7 @@ IsValidWorkSpace (
   ASSERT_EFI_ERROR (Status);\r
 \r
   if (WorkingBlockHeader.Crc != WorkingHeader->Crc) {\r
-    DEBUG ((EFI_D_FTW_LITE, "FtwLite: Work block header CRC check error\n"));\r
+    DEBUG ((EFI_D_ERROR, "FtwLite: Work block header CRC check error\n"));\r
     return FALSE;\r
   }\r
 \r
@@ -290,7 +292,7 @@ WorkSpaceRefresh (
     //\r
     Status = FtwReclaimWorkSpace (FtwLiteDevice, TRUE);\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((EFI_D_FTW_LITE, "FtwLite: Reclaim workspace - %r\n", Status));\r
+      DEBUG ((EFI_D_ERROR, "FtwLite: Reclaim workspace - %r\n", Status));\r
       return EFI_ABORTED;\r
     }\r
   }\r
@@ -327,7 +329,7 @@ FtwReclaimWorkSpace (
   EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER *WorkingBlockHeader;\r
   EFI_FTW_LITE_RECORD                     *Record;\r
 \r
-  DEBUG ((EFI_D_FTW_LITE, "FtwLite: start to reclaim work space\n"));\r
+  DEBUG ((EFI_D_ERROR, "FtwLite: start to reclaim work space\n"));\r
 \r
   //\r
   // Read all original data from working block to a memory buffer\r
@@ -340,7 +342,7 @@ FtwReclaimWorkSpace (
 \r
   Ptr = TempBuffer;\r
   for (Index = 0; Index < FtwLiteDevice->NumberOfSpareBlock; Index += 1) {\r
-    Length = FtwLiteDevice->SizeOfSpareBlock;\r
+    Length = FtwLiteDevice->BlockSize;\r
     Status = FtwLiteDevice->FtwFvBlock->Read (\r
                                           FtwLiteDevice->FtwFvBlock,\r
                                           FtwLiteDevice->FtwWorkBlockLba + Index,\r
@@ -360,7 +362,7 @@ FtwReclaimWorkSpace (
   //\r
   Ptr = TempBuffer +\r
     ((UINTN) (FtwLiteDevice->FtwWorkSpaceLba - FtwLiteDevice->FtwWorkBlockLba)) *\r
-    FtwLiteDevice->SizeOfSpareBlock + FtwLiteDevice->FtwWorkSpaceBase;\r
+    FtwLiteDevice->BlockSize + FtwLiteDevice->FtwWorkSpaceBase;\r
 \r
   //\r
   // Clear the content of buffer that will save the new work space data\r
@@ -421,7 +423,7 @@ FtwReclaimWorkSpace (
 \r
   Ptr = SpareBuffer;\r
   for (Index = 0; Index < FtwLiteDevice->NumberOfSpareBlock; Index += 1) {\r
-    Length = FtwLiteDevice->SizeOfSpareBlock;\r
+    Length = FtwLiteDevice->BlockSize;\r
     Status = FtwLiteDevice->FtwBackupFvb->Read (\r
                                             FtwLiteDevice->FtwBackupFvb,\r
                                             FtwLiteDevice->FtwSpareLba + Index,\r
@@ -443,7 +445,7 @@ FtwReclaimWorkSpace (
   Status  = FtwEraseSpareBlock (FtwLiteDevice);\r
   Ptr     = TempBuffer;\r
   for (Index = 0; Index < FtwLiteDevice->NumberOfSpareBlock; Index += 1) {\r
-    Length = FtwLiteDevice->SizeOfSpareBlock;\r
+    Length = FtwLiteDevice->BlockSize;\r
     Status = FtwLiteDevice->FtwBackupFvb->Write (\r
                                             FtwLiteDevice->FtwBackupFvb,\r
                                             FtwLiteDevice->FtwSpareLba + Index,\r
@@ -478,7 +480,7 @@ FtwReclaimWorkSpace (
   Status  = FtwEraseSpareBlock (FtwLiteDevice);\r
   Ptr     = SpareBuffer;\r
   for (Index = 0; Index < FtwLiteDevice->NumberOfSpareBlock; Index += 1) {\r
-    Length = FtwLiteDevice->SizeOfSpareBlock;\r
+    Length = FtwLiteDevice->BlockSize;\r
     Status = FtwLiteDevice->FtwBackupFvb->Write (\r
                                             FtwLiteDevice->FtwBackupFvb,\r
                                             FtwLiteDevice->FtwSpareLba + Index,\r
@@ -496,7 +498,7 @@ FtwReclaimWorkSpace (
 \r
   FreePool (SpareBuffer);\r
 \r
-  DEBUG ((EFI_D_FTW_LITE, "FtwLite: reclaim work space success\n"));\r
+  DEBUG ((EFI_D_ERROR, "FtwLite: reclaim work space success\n"));\r
 \r
   return EFI_SUCCESS;\r
 }\r