MdeModulePkg: Change use of EFI_D_* to DEBUG_*

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

diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FtwMisc.c b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FtwMisc.c
index ed73f887aa020c6ceaa36a64ac16d428cb8ef762..dce50e81abadcbfe20135b7d6d15944bd8dbcbb4 100644 (file)
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FtwMisc.c
+++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FtwMisc.c
@@ -340,7 +340,7 @@ FlushSpareBlockToBootBlock (
   //\r
   Status = SarProtocol->GetSwapState (SarProtocol, &TopSwap);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "Ftw: Get Top Swapped status - %r\n", Status));\r
+    DEBUG ((DEBUG_ERROR, "Ftw: Get Top Swapped status - %r\n", Status));\r
     FreePool (Buffer);\r
     return EFI_ABORTED;\r
   }\r
@@ -427,7 +427,7 @@ FlushSpareBlockToBootBlock (
                                         Ptr\r
                                         );\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((EFI_D_ERROR, "Ftw: FVB Write boot block - %r\n", Status));\r
+      DEBUG ((DEBUG_ERROR, "Ftw: FVB Write boot block - %r\n", Status));\r
       FreePool (Buffer);\r
       return Status;\r
     }\r
@@ -526,7 +526,7 @@ FlushSpareBlockToTargetBlock (
     Count   = BlockSize;\r
     Status  = FvBlock->Write (FvBlock, Lba + Index, 0, &Count, Ptr);\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((EFI_D_ERROR, "Ftw: FVB Write block - %r\n", Status));\r
+      DEBUG ((DEBUG_ERROR, "Ftw: FVB Write block - %r\n", Status));\r
       FreePool (Buffer);\r
       return Status;\r
     }\r
@@ -667,7 +667,7 @@ FlushSpareBlockToWorkingBlock (
                                       Ptr\r
                                       );\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((EFI_D_ERROR, "Ftw: FVB Write block - %r\n", Status));\r
+      DEBUG ((DEBUG_ERROR, "Ftw: FVB Write block - %r\n", Status));\r
       FreePool (Buffer);\r
       return Status;\r
     }\r
@@ -984,7 +984,7 @@ InitFtwDevice (
   FtwDevice->WorkSpaceLength  = (UINTN) PcdGet32 (PcdFlashNvStorageFtwWorkingSize);\r
   FtwDevice->SpareAreaLength  = (UINTN) PcdGet32 (PcdFlashNvStorageFtwSpareSize);\r
   if ((FtwDevice->WorkSpaceLength == 0) || (FtwDevice->SpareAreaLength == 0)) {\r
-    DEBUG ((EFI_D_ERROR, "Ftw: Workspace or Spare block does not exist!\n"));\r
+    DEBUG ((DEBUG_ERROR, "Ftw: Workspace or Spare block does not exist!\n"));\r
     FreePool (FtwDevice);\r
     return EFI_INVALID_PARAMETER;\r
   }\r
@@ -1103,13 +1103,13 @@ FindFvbForFtw (
             //\r
             if (((FtwDevice->WorkSpaceAddress & (FtwDevice->WorkBlockSize - 1)) != 0) ||\r
                 ((FtwDevice->WorkSpaceLength & (FtwDevice->WorkBlockSize - 1)) != 0)) {\r
-              DEBUG ((EFI_D_ERROR, "Ftw: Work space address or length is not block size aligned when work space size is larger than one block size\n"));\r
+              DEBUG ((DEBUG_ERROR, "Ftw: Work space address or length is not block size aligned when work space size is larger than one block size\n"));\r
               FreePool (HandleBuffer);\r
               ASSERT (FALSE);\r
               return EFI_ABORTED;\r
             }\r
           } else if ((FtwDevice->FtwWorkSpaceBase + FtwDevice->FtwWorkSpaceSize) > FtwDevice->WorkBlockSize) {\r
-            DEBUG ((EFI_D_ERROR, "Ftw: The work space range should not span blocks when work space size is less than one block size\n"));\r
+            DEBUG ((DEBUG_ERROR, "Ftw: The work space range should not span blocks when work space size is less than one block size\n"));\r
             FreePool (HandleBuffer);\r
             ASSERT (FALSE);\r
             return EFI_ABORTED;\r
@@ -1138,7 +1138,7 @@ FindFvbForFtw (
           // Check the range of spare area to make sure that it's in FV range\r
           //\r
           if ((FtwDevice->FtwSpareLba + FtwDevice->NumberOfSpareBlock) > NumberOfBlocks) {\r
-            DEBUG ((EFI_D_ERROR, "Ftw: Spare area is out of FV range\n"));\r
+            DEBUG ((DEBUG_ERROR, "Ftw: Spare area is out of FV range\n"));\r
             FreePool (HandleBuffer);\r
             ASSERT (FALSE);\r
             return EFI_ABORTED;\r
@@ -1148,7 +1148,7 @@ FindFvbForFtw (
           //\r
           if (((FtwDevice->SpareAreaAddress & (FtwDevice->SpareBlockSize - 1)) != 0) ||\r
               ((FtwDevice->SpareAreaLength & (FtwDevice->SpareBlockSize - 1)) != 0)) {\r
-            DEBUG ((EFI_D_ERROR, "Ftw: Spare area address or length is not block size aligned\n"));\r
+            DEBUG ((DEBUG_ERROR, "Ftw: Spare area address or length is not block size aligned\n"));\r
             FreePool (HandleBuffer);\r
             //\r
             // Report Status Code EFI_SW_EC_ABORTED.\r
@@ -1168,8 +1168,8 @@ FindFvbForFtw (
     (FtwDevice->FtwWorkSpaceLba == (EFI_LBA) (-1)) || (FtwDevice->FtwSpareLba == (EFI_LBA) (-1))) {\r
     return EFI_ABORTED;\r
   }\r
-  DEBUG ((EFI_D_INFO, "Ftw: FtwWorkSpaceLba - 0x%lx, WorkBlockSize  - 0x%x, FtwWorkSpaceBase - 0x%x\n", FtwDevice->FtwWorkSpaceLba, FtwDevice->WorkBlockSize, FtwDevice->FtwWorkSpaceBase));\r
-  DEBUG ((EFI_D_INFO, "Ftw: FtwSpareLba     - 0x%lx, SpareBlockSize - 0x%x\n", FtwDevice->FtwSpareLba, FtwDevice->SpareBlockSize));\r
+  DEBUG ((DEBUG_INFO, "Ftw: FtwWorkSpaceLba - 0x%lx, WorkBlockSize  - 0x%x, FtwWorkSpaceBase - 0x%x\n", FtwDevice->FtwWorkSpaceLba, FtwDevice->WorkBlockSize, FtwDevice->FtwWorkSpaceBase));\r
+  DEBUG ((DEBUG_INFO, "Ftw: FtwSpareLba     - 0x%lx, SpareBlockSize - 0x%x\n", FtwDevice->FtwSpareLba, FtwDevice->SpareBlockSize));\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -1225,7 +1225,7 @@ InitFtwProtocol (
     }\r
   }\r
   FtwDevice->FtwWorkBlockLba = FtwDevice->FtwWorkSpaceLba + FtwDevice->NumberOfWorkSpaceBlock - FtwDevice->NumberOfWorkBlock;\r
-  DEBUG ((EFI_D_INFO, "Ftw: NumberOfWorkBlock - 0x%x, FtwWorkBlockLba - 0x%lx\n", FtwDevice->NumberOfWorkBlock, FtwDevice->FtwWorkBlockLba));\r
+  DEBUG ((DEBUG_INFO, "Ftw: NumberOfWorkBlock - 0x%x, FtwWorkBlockLba - 0x%lx\n", FtwDevice->NumberOfWorkBlock, FtwDevice->FtwWorkBlockLba));\r
 \r
   //\r
   // Calcualte the LBA and base of work space in spare block.\r
@@ -1234,7 +1234,7 @@ InitFtwProtocol (
   WorkSpaceLbaOffset = FtwDevice->FtwWorkSpaceLba - FtwDevice->FtwWorkBlockLba;\r
   FtwDevice->FtwWorkSpaceLbaInSpare = (EFI_LBA) (((UINTN) WorkSpaceLbaOffset * FtwDevice->WorkBlockSize + FtwDevice->FtwWorkSpaceBase) / FtwDevice->SpareBlockSize);\r
   FtwDevice->FtwWorkSpaceBaseInSpare = ((UINTN) WorkSpaceLbaOffset * FtwDevice->WorkBlockSize + FtwDevice->FtwWorkSpaceBase) % FtwDevice->SpareBlockSize;\r
-  DEBUG ((EFI_D_INFO, "Ftw: WorkSpaceLbaInSpare - 0x%lx, WorkSpaceBaseInSpare - 0x%x\n", FtwDevice->FtwWorkSpaceLbaInSpare, FtwDevice->FtwWorkSpaceBaseInSpare));\r
+  DEBUG ((DEBUG_INFO, "Ftw: WorkSpaceLbaInSpare - 0x%lx, WorkSpaceBaseInSpare - 0x%x\n", FtwDevice->FtwWorkSpaceLbaInSpare, FtwDevice->FtwWorkSpaceBaseInSpare));\r
 \r
   //\r
   // Initialize other parameters, and set WorkSpace as FTW_ERASED_BYTE.\r
@@ -1274,7 +1274,7 @@ InitFtwProtocol (
     //\r
     if (IsValidWorkSpace (FtwDevice->FtwWorkSpaceHeader)) {\r
       Status = FlushSpareBlockToWorkingBlock (FtwDevice);\r
-      DEBUG ((EFI_D_INFO, "Ftw: Restart working block update in %a() - %r\n",\r
+      DEBUG ((DEBUG_INFO, "Ftw: Restart working block update in %a() - %r\n",\r
         __FUNCTION__, Status));\r
       FtwAbort (&FtwDevice->FtwInstance);\r
       //\r
@@ -1283,7 +1283,7 @@ InitFtwProtocol (
       Status = WorkSpaceRefresh (FtwDevice);\r
       ASSERT_EFI_ERROR (Status);\r
     } else {\r
-      DEBUG ((EFI_D_INFO,\r
+      DEBUG ((DEBUG_INFO,\r
         "Ftw: Both working and spare blocks are invalid, init workspace\n"));\r
       //\r
       // If both are invalid, then initialize work space.\r
@@ -1309,7 +1309,7 @@ InitFtwProtocol (
     (FtwDevice->FtwLastWriteRecord->SpareComplete != FTW_VALID_STATE) &&\r
     IsFirstRecordOfWrites (FtwDevice->FtwLastWriteHeader, FtwDevice->FtwLastWriteRecord)\r
     ) {\r
-    DEBUG ((EFI_D_ERROR, "Ftw: Init.. find first record not SpareCompleted, abort()\n"));\r
+    DEBUG ((DEBUG_ERROR, "Ftw: Init.. find first record not SpareCompleted, abort()\n"));\r
     FtwAbort (&FtwDevice->FtwInstance);\r
   }\r
   //\r
@@ -1320,7 +1320,7 @@ InitFtwProtocol (
     (FtwDevice->FtwLastWriteRecord->DestinationComplete == FTW_VALID_STATE) &&\r
     IsLastRecordOfWrites (FtwDevice->FtwLastWriteHeader, FtwDevice->FtwLastWriteRecord)\r
     ) {\r
-    DEBUG ((EFI_D_ERROR, "Ftw: Init.. find last record completed but header not, abort()\n"));\r
+    DEBUG ((DEBUG_ERROR, "Ftw: Init.. find last record completed but header not, abort()\n"));\r
     FtwAbort (&FtwDevice->FtwInstance);\r
   }\r
   //\r
@@ -1346,7 +1346,7 @@ InitFtwProtocol (
     ) {\r
     if (FtwDevice->FtwLastWriteRecord->BootBlockUpdate == FTW_VALID_STATE) {\r
       Status = FlushSpareBlockToBootBlock (FtwDevice);\r
-      DEBUG ((EFI_D_ERROR, "Ftw: Restart boot block update - %r\n", Status));\r
+      DEBUG ((DEBUG_ERROR, "Ftw: Restart boot block update - %r\n", Status));\r
       ASSERT_EFI_ERROR (Status);\r
       FtwAbort (&FtwDevice->FtwInstance);\r
     } else {\r
@@ -1357,7 +1357,7 @@ InitFtwProtocol (
       FvbHandle = GetFvbByAddress ((EFI_PHYSICAL_ADDRESS) (UINTN) ((INT64) FtwDevice->SpareAreaAddress + FtwDevice->FtwLastWriteRecord->RelativeOffset), &Fvb);\r
       if (FvbHandle != NULL) {\r
         Status = FtwRestart (&FtwDevice->FtwInstance, FvbHandle);\r
-        DEBUG ((EFI_D_ERROR, "Ftw: Restart last write - %r\n", Status));\r
+        DEBUG ((DEBUG_ERROR, "Ftw: Restart last write - %r\n", Status));\r
         ASSERT_EFI_ERROR (Status);\r
       }\r
       FtwAbort (&FtwDevice->FtwInstance);\r
@@ -1375,4 +1375,3 @@ InitFtwProtocol (
 \r
   return EFI_SUCCESS;\r
 }\r
-\r