MdeModulePkg: Change use of EFI_D_* to DEBUG_*

[mirror_edk2.git] / MdeModulePkg / Core / Pei / FwVol / FwVol.c

diff --git a/MdeModulePkg/Core/Pei/FwVol/FwVol.c b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
index fa1a3d3accb864da2a8c73f42fcde5ead6c78261..bf8dbd376354e785fb58942ffee3d53c37194d0d 100644 (file)
--- a/MdeModulePkg/Core/Pei/FwVol/FwVol.c
+++ b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
@@ -317,7 +317,7 @@ FindFileEx (
   } else {\r
     if (IS_FFS_FILE2 (*FileHeader)) {\r
       if (!IsFfs3Fv) {\r
-        DEBUG ((EFI_D_ERROR, "It is a FFS3 formatted file: %g in a non-FFS3 formatted FV.\n", &(*FileHeader)->Name));\r
+        DEBUG ((DEBUG_ERROR, "It is a FFS3 formatted file: %g in a non-FFS3 formatted FV.\n", &(*FileHeader)->Name));\r
       }\r
       FileLength = FFS_FILE2_SIZE (*FileHeader);\r
       ASSERT (FileLength > 0x00FFFFFF);\r
@@ -345,7 +345,7 @@ FindFileEx (
     case EFI_FILE_HEADER_INVALID:\r
       if (IS_FFS_FILE2 (FfsFileHeader)) {\r
         if (!IsFfs3Fv) {\r
-          DEBUG ((EFI_D_ERROR, "Found a FFS3 formatted file: %g in a non-FFS3 formatted FV.\n", &FfsFileHeader->Name));\r
+          DEBUG ((DEBUG_ERROR, "Found a FFS3 formatted file: %g in a non-FFS3 formatted FV.\n", &FfsFileHeader->Name));\r
         }\r
         FileOffset    += sizeof (EFI_FFS_FILE_HEADER2);\r
         FfsFileHeader =  (EFI_FFS_FILE_HEADER *) ((UINT8 *) FfsFileHeader + sizeof (EFI_FFS_FILE_HEADER2));\r
@@ -368,7 +368,7 @@ FindFileEx (
         ASSERT (FileLength > 0x00FFFFFF);\r
         FileOccupiedSize = GET_OCCUPIED_SIZE (FileLength, 8);\r
         if (!IsFfs3Fv) {\r
-          DEBUG ((EFI_D_ERROR, "Found a FFS3 formatted file: %g in a non-FFS3 formatted FV.\n", &FfsFileHeader->Name));\r
+          DEBUG ((DEBUG_ERROR, "Found a FFS3 formatted file: %g in a non-FFS3 formatted FV.\n", &FfsFileHeader->Name));\r
           FileOffset += FileOccupiedSize;\r
           FfsFileHeader = (EFI_FFS_FILE_HEADER *) ((UINT8 *) FfsFileHeader + FileOccupiedSize);\r
           break;\r
@@ -424,7 +424,7 @@ FindFileEx (
     case EFI_FILE_DELETED:\r
       if (IS_FFS_FILE2 (FfsFileHeader)) {\r
         if (!IsFfs3Fv) {\r
-          DEBUG ((EFI_D_ERROR, "Found a FFS3 formatted file: %g in a non-FFS3 formatted FV.\n", &FfsFileHeader->Name));\r
+          DEBUG ((DEBUG_ERROR, "Found a FFS3 formatted file: %g in a non-FFS3 formatted FV.\n", &FfsFileHeader->Name));\r
         }\r
         FileLength = FFS_FILE2_SIZE (FfsFileHeader);\r
         ASSERT (FileLength > 0x00FFFFFF);\r
@@ -509,7 +509,7 @@ PeiInitializeFv (
   PrivateData->Fv[PrivateData->FvCount].FvHandle = FvHandle;\r
   PrivateData->Fv[PrivateData->FvCount].AuthenticationStatus = 0;\r
   DEBUG ((\r
-    EFI_D_INFO,\r
+    DEBUG_INFO,\r
     "The %dth FV start address is 0x%11p, size is 0x%08x, handle is 0x%p\n",\r
     (UINT32) PrivateData->FvCount,\r
     (VOID *) BfvHeader,\r
@@ -607,7 +607,7 @@ FirmwareVolumeInfoPpiNotifyCallback (
     //\r
     Status = FvPpi->ProcessVolume (FvPpi, FvInfo2Ppi.FvInfo, FvInfo2Ppi.FvInfoSize, &FvHandle);\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((EFI_D_ERROR, "Fail to process new found FV, FV may be corrupted!\n"));\r
+      DEBUG ((DEBUG_ERROR, "Fail to process new found FV, FV may be corrupted!\n"));\r
       return Status;\r
     }\r
 \r
@@ -618,7 +618,7 @@ FirmwareVolumeInfoPpiNotifyCallback (
       if (PrivateData->Fv[FvIndex].FvHandle == FvHandle) {\r
         if (IsFvInfo2 && (FvInfo2Ppi.AuthenticationStatus != PrivateData->Fv[FvIndex].AuthenticationStatus)) {\r
           PrivateData->Fv[FvIndex].AuthenticationStatus = FvInfo2Ppi.AuthenticationStatus;\r
-          DEBUG ((EFI_D_INFO, "Update AuthenticationStatus of the %dth FV to 0x%x!\n", FvIndex, FvInfo2Ppi.AuthenticationStatus));\r
+          DEBUG ((DEBUG_INFO, "Update AuthenticationStatus of the %dth FV to 0x%x!\n", FvIndex, FvInfo2Ppi.AuthenticationStatus));\r
         }\r
         DEBUG ((DEBUG_INFO, "The FV %p has already been processed!\n", FvInfo2Ppi.FvInfo));\r
         return EFI_SUCCESS;\r
@@ -651,7 +651,7 @@ FirmwareVolumeInfoPpiNotifyCallback (
     PrivateData->Fv[PrivateData->FvCount].AuthenticationStatus = FvInfo2Ppi.AuthenticationStatus;\r
     CurFvCount = PrivateData->FvCount;\r
     DEBUG ((\r
-      EFI_D_INFO,\r
+      DEBUG_INFO,\r
       "The %dth FV start address is 0x%11p, size is 0x%08x, handle is 0x%p\n",\r
       (UINT32) CurFvCount,\r
       (VOID *) FvInfo2Ppi.FvInfo,\r
@@ -687,12 +687,12 @@ FirmwareVolumeInfoPpiNotifyCallback (
           }\r
         }\r
 \r
-        DEBUG ((EFI_D_INFO, "Found firmware volume Image File %p in FV[%d] %p\n", FileHandle, CurFvCount, FvHandle));\r
+        DEBUG ((DEBUG_INFO, "Found firmware volume Image File %p in FV[%d] %p\n", FileHandle, CurFvCount, FvHandle));\r
         ProcessFvFile (PrivateData, &PrivateData->Fv[CurFvCount], FileHandle);\r
       }\r
     } while (FileHandle != NULL);\r
   } else {\r
-    DEBUG ((EFI_D_ERROR, "Fail to process FV %p because no corresponding EFI_FIRMWARE_VOLUME_PPI is found!\n", FvInfo2Ppi.FvInfo));\r
+    DEBUG ((DEBUG_ERROR, "Fail to process FV %p because no corresponding EFI_FIRMWARE_VOLUME_PPI is found!\n", FvInfo2Ppi.FvInfo));\r
 \r
     AddUnknownFormatFvInfo (PrivateData, &FvInfo2Ppi);\r
   }\r
@@ -808,7 +808,7 @@ ProcessSection (
     if (IS_SECTION2 (Section)) {\r
       ASSERT (SECTION2_SIZE (Section) > 0x00FFFFFF);\r
       if (!IsFfs3Fv) {\r
-        DEBUG ((EFI_D_ERROR, "Found a FFS3 formatted section in a non-FFS3 formatted FV.\n"));\r
+        DEBUG ((DEBUG_ERROR, "Found a FFS3 formatted section in a non-FFS3 formatted FV.\n"));\r
         SectionLength = SECTION2_SIZE (Section);\r
         //\r
         // SectionLength is adjusted it is 4 byte aligned.\r
@@ -1404,7 +1404,7 @@ ProcessFvFile (
       //\r
       // this FILE has been dispatched, it will not be dispatched again.\r
       //\r
-      DEBUG ((EFI_D_INFO, "FV file %p has been dispatched!\r\n", ParentFvFileHandle));\r
+      DEBUG ((DEBUG_INFO, "FV file %p has been dispatched!\r\n", ParentFvFileHandle));\r
       return EFI_SUCCESS;\r
     }\r
     HobPtr.Raw = GET_NEXT_HOB (HobPtr);\r
@@ -1628,7 +1628,7 @@ PeiFfsFvPpiProcessVolume (
   //\r
   Status = VerifyFv ((EFI_FIRMWARE_VOLUME_HEADER*) Buffer);\r
   if (EFI_ERROR(Status)) {\r
-    DEBUG ((EFI_D_ERROR, "Fail to verify FV which address is 0x%11p", Buffer));\r
+    DEBUG ((DEBUG_ERROR, "Fail to verify FV which address is 0x%11p", Buffer));\r
     return EFI_VOLUME_CORRUPTED;\r
   }\r
 \r
@@ -1810,7 +1810,7 @@ PeiFfsFvPpiGetFileInfo (
   if (IS_FFS_FILE2 (FileHeader)) {\r
     ASSERT (FFS_FILE2_SIZE (FileHeader) > 0x00FFFFFF);\r
     if (!FwVolInstance->IsFfs3Fv) {\r
-      DEBUG ((EFI_D_ERROR, "It is a FFS3 formatted file: %g in a non-FFS3 formatted FV.\n", &FileHeader->Name));\r
+      DEBUG ((DEBUG_ERROR, "It is a FFS3 formatted file: %g in a non-FFS3 formatted FV.\n", &FileHeader->Name));\r
       return EFI_INVALID_PARAMETER;\r
     }\r
     FileInfo->BufferSize = FFS_FILE2_SIZE (FileHeader) - sizeof (EFI_FFS_FILE_HEADER2);\r
@@ -2029,7 +2029,7 @@ PeiFfsFvPpiFindSectionByType2 (
   if (IS_FFS_FILE2 (FfsFileHeader)) {\r
     ASSERT (FFS_FILE2_SIZE (FfsFileHeader) > 0x00FFFFFF);\r
     if (!FwVolInstance->IsFfs3Fv) {\r
-      DEBUG ((EFI_D_ERROR, "It is a FFS3 formatted file: %g in a non-FFS3 formatted FV.\n", &FfsFileHeader->Name));\r
+      DEBUG ((DEBUG_ERROR, "It is a FFS3 formatted file: %g in a non-FFS3 formatted FV.\n", &FfsFileHeader->Name));\r
       return EFI_NOT_FOUND;\r
     }\r
     Section = (EFI_COMMON_SECTION_HEADER *) ((UINT8 *) FfsFileHeader + sizeof (EFI_FFS_FILE_HEADER2));\r
@@ -2344,7 +2344,7 @@ ThirdPartyFvPpiNotifyCallback (
     //\r
     Status = FvPpi->ProcessVolume (FvPpi, FvInfo, FvInfoSize, &FvHandle);\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((EFI_D_ERROR, "Fail to process the FV 0x%p, FV may be corrupted!\n", FvInfo));\r
+      DEBUG ((DEBUG_ERROR, "Fail to process the FV 0x%p, FV may be corrupted!\n", FvInfo));\r
       continue;\r
     }\r
 \r
@@ -2390,7 +2390,7 @@ ThirdPartyFvPpiNotifyCallback (
     PrivateData->Fv[PrivateData->FvCount].AuthenticationStatus = AuthenticationStatus;\r
     CurFvCount = PrivateData->FvCount;\r
     DEBUG ((\r
-      EFI_D_INFO,\r
+      DEBUG_INFO,\r
       "The %dth FV start address is 0x%11p, size is 0x%08x, handle is 0x%p\n",\r
       (UINT32) CurFvCount,\r
       (VOID *) FvInfo,\r
@@ -2426,7 +2426,7 @@ ThirdPartyFvPpiNotifyCallback (
           }\r
         }\r
 \r
-        DEBUG ((EFI_D_INFO, "Found firmware volume Image File %p in FV[%d] %p\n", FileHandle, CurFvCount, FvHandle));\r
+        DEBUG ((DEBUG_INFO, "Found firmware volume Image File %p in FV[%d] %p\n", FileHandle, CurFvCount, FvHandle));\r
         ProcessFvFile (PrivateData, &PrivateData->Fv[CurFvCount], FileHandle);\r
       }\r
     } while (FileHandle != NULL);\r