EmulatorPkg: Change use of EFI_D_* to DEBUG_*

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3739

Update all use of EFI_D_* defines in DEBUG() macros to DEBUG_* defines.

Cc: Andrew Fish <afish@apple.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael Kubacki <michael.kubacki@microsoft.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>

diff --git a/EmulatorPkg/AutoScanPei/AutoScanPei.c b/EmulatorPkg/AutoScanPei/AutoScanPei.c
index c5e190a93c61669bea62cbf0109bbe7e5cb3053a..eec04fc88d4de52c3f716d02f484a0087eb926dc 100644 (file)
--- a/EmulatorPkg/AutoScanPei/AutoScanPei.c
+++ b/EmulatorPkg/AutoScanPei/AutoScanPei.c
@@ -47,7 +47,7 @@ Returns:
   EFI_RESOURCE_ATTRIBUTE_TYPE Attributes;\r
 \r
 \r
-  DEBUG ((EFI_D_ERROR, "Emu Autoscan PEIM Loaded\n"));\r
+  DEBUG ((DEBUG_ERROR, "Emu Autoscan PEIM Loaded\n"));\r
 \r
   //\r
   // Get the PEI UNIX Autoscan PPI\r

diff --git a/EmulatorPkg/BootModePei/BootModePei.c b/EmulatorPkg/BootModePei/BootModePei.c
index a008a2331d9f08a7d3e211cc5ccc99b7afc1e012..d523a5f87374e30b5584cd253712b3f494e62c21 100644 (file)
--- a/EmulatorPkg/BootModePei/BootModePei.c
+++ b/EmulatorPkg/BootModePei/BootModePei.c
@@ -69,7 +69,7 @@ Returns:
   EFI_STATUS    Status;\r
   EFI_BOOT_MODE BootMode;\r
 \r
-  DEBUG ((EFI_D_ERROR, "Emu Boot Mode PEIM Loaded\n"));\r
+  DEBUG ((DEBUG_ERROR, "Emu Boot Mode PEIM Loaded\n"));\r
 \r
   BootMode  = FixedPcdGet32 (PcdEmuBootMode);\r
 \r

diff --git a/EmulatorPkg/FirmwareVolumePei/FirmwareVolumePei.c b/EmulatorPkg/FirmwareVolumePei/FirmwareVolumePei.c
index 4178111096694c35d68544785e19f94d1255b504..4a3bfb226c87cbed13dee3ce434805b081b6c33e 100644 (file)
--- a/EmulatorPkg/FirmwareVolumePei/FirmwareVolumePei.c
+++ b/EmulatorPkg/FirmwareVolumePei/FirmwareVolumePei.c
@@ -44,7 +44,7 @@ Returns:
   UINT64                      FdSize;\r
   UINTN                       Index;\r
 \r
-  DEBUG ((EFI_D_ERROR, "Unix Firmware Volume PEIM Loaded\n"));\r
+  DEBUG ((DEBUG_ERROR, "Unix Firmware Volume PEIM Loaded\n"));\r
 \r
   //\r
   // Get the Fwh Information PPI\r

diff --git a/EmulatorPkg/FlashMapPei/FlashMapPei.c b/EmulatorPkg/FlashMapPei/FlashMapPei.c
index 7744065dd6afddd8ba5f0f68f3b6a90dc18c6346..2be0627fd96795581150fc8f7a50a9ba810bc185 100644 (file)
--- a/EmulatorPkg/FlashMapPei/FlashMapPei.c
+++ b/EmulatorPkg/FlashMapPei/FlashMapPei.c
@@ -48,7 +48,7 @@ Returns:
   EFI_PHYSICAL_ADDRESS    FdFixUp;\r
   UINT64                  FdSize;\r
 \r
-  DEBUG ((EFI_D_ERROR, "EmulatorPkg Flash Map PEIM Loaded\n"));\r
+  DEBUG ((DEBUG_ERROR, "EmulatorPkg Flash Map PEIM Loaded\n"));\r
 \r
   //\r
   // Get the Fwh Information PPI\r

diff --git a/EmulatorPkg/Sec/Sec.c b/EmulatorPkg/Sec/Sec.c
index 1c0f73d66944d3b4e4c153b3e082aa7f3d68c6de..e1bee4f6b49e2dfb6ad44483713561b0d7bd4f0f 100644 (file)
--- a/EmulatorPkg/Sec/Sec.c
+++ b/EmulatorPkg/Sec/Sec.c
@@ -80,7 +80,7 @@ _ModuleEntryPoint (
   EMU_MAGIC_PAGE()->PpiList = PpiList;\r
   ProcessLibraryConstructorList ();\r
 \r
-  DEBUG ((EFI_D_ERROR, "SEC Has Started\n"));\r
+  DEBUG ((DEBUG_ERROR, "SEC Has Started\n"));\r
 \r
   //\r
   // Add Our PPIs to the list\r
@@ -136,5 +136,3 @@ _ModuleEntryPoint (
   ASSERT (FALSE);\r
   return;\r
 }\r
-\r
-\r

diff --git a/EmulatorPkg/ThunkPpiToProtocolPei/ThunkPpiToProtocolPei.c b/EmulatorPkg/ThunkPpiToProtocolPei/ThunkPpiToProtocolPei.c
index f168811adf94274d9b8790f4a8c2c61d7d558710..966da3b2264ea84860a52e949d6ae2cecd458e5b 100644 (file)
--- a/EmulatorPkg/ThunkPpiToProtocolPei/ThunkPpiToProtocolPei.c
+++ b/EmulatorPkg/ThunkPpiToProtocolPei/ThunkPpiToProtocolPei.c
@@ -47,7 +47,7 @@ Returns:
   EMU_THUNK_PPI           *Thunk;\r
   VOID                    *Ptr;\r
 \r
-  DEBUG ((EFI_D_ERROR, "Emu Thunk PEIM Loaded\n"));\r
+  DEBUG ((DEBUG_ERROR, "Emu Thunk PEIM Loaded\n"));\r
 \r
   Status = PeiServicesLocatePpi (\r
               &gEmuThunkPpiGuid,        // GUID\r

diff --git a/EmulatorPkg/Unix/Host/BlockIo.c b/EmulatorPkg/Unix/Host/BlockIo.c
index 18368060d59a688f56beccff277ecd555dd2ca6d..e3d7c52a4373e281335fa8c4ee6d5edf3327e5a0 100644 (file)
--- a/EmulatorPkg/Unix/Host/BlockIo.c
+++ b/EmulatorPkg/Unix/Host/BlockIo.c
@@ -166,7 +166,7 @@ EmuBlockIoOpenDevice (
     }\r
   }\r
 \r
-  DEBUG ((EFI_D_INIT, "%HEmuOpenBlock: opened %a%N\n", Private->Filename));\r
+  DEBUG ((DEBUG_INIT, "%HEmuOpenBlock: opened %a%N\n", Private->Filename));\r
   Status = EFI_SUCCESS;\r
 \r
 Done:\r
@@ -282,7 +282,7 @@ EmuBlockIoReadWriteCommon (
   }\r
 \r
   if (!Private->Media->MediaPresent) {\r
-    DEBUG ((EFI_D_INIT, "%s: No Media\n", CallerName));\r
+    DEBUG ((DEBUG_INIT, "%s: No Media\n", CallerName));\r
     return EFI_NO_MEDIA;\r
   }\r
 \r
@@ -299,18 +299,18 @@ EmuBlockIoReadWriteCommon (
   //\r
   BlockSize = Private->Media->BlockSize;\r
   if (BufferSize == 0) {\r
-    DEBUG ((EFI_D_INIT, "%s: Zero length read\n", CallerName));\r
+    DEBUG ((DEBUG_INIT, "%s: Zero length read\n", CallerName));\r
     return EFI_SUCCESS;\r
   }\r
 \r
   if ((BufferSize % BlockSize) != 0) {\r
-    DEBUG ((EFI_D_INIT, "%s: Invalid read size\n", CallerName));\r
+    DEBUG ((DEBUG_INIT, "%s: Invalid read size\n", CallerName));\r
     return EFI_BAD_BUFFER_SIZE;\r
   }\r
 \r
   LastBlock = Lba + (BufferSize / BlockSize) - 1;\r
   if (LastBlock > Private->Media->LastBlock) {\r
-    DEBUG ((EFI_D_INIT, "ReadBlocks: Attempted to read off end of device\n"));\r
+    DEBUG ((DEBUG_INIT, "ReadBlocks: Attempted to read off end of device\n"));\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   //\r
@@ -320,7 +320,7 @@ EmuBlockIoReadWriteCommon (
   Status = SetFilePointer64 (Private, DistanceToMove, &DistanceMoved, SEEK_SET);\r
 \r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_INIT, "WriteBlocks: SetFilePointer failed\n"));\r
+    DEBUG ((DEBUG_INIT, "WriteBlocks: SetFilePointer failed\n"));\r
     return EmuBlockIoError (Private);\r
   }\r
 \r
@@ -384,7 +384,7 @@ EmuBlockIoReadBlocks (
 \r
   len = read (Private->fd, Buffer, BufferSize);\r
   if (len != BufferSize) {\r
-    DEBUG ((EFI_D_INIT, "ReadBlocks: ReadFile failed.\n"));\r
+    DEBUG ((DEBUG_INIT, "ReadBlocks: ReadFile failed.\n"));\r
     Status = EmuBlockIoError (Private);\r
     goto Done;\r
   }\r
@@ -462,7 +462,7 @@ EmuBlockIoWriteBlocks (
 \r
   len = write (Private->fd, Buffer, BufferSize);\r
   if (len != BufferSize) {\r
-    DEBUG ((EFI_D_INIT, "ReadBlocks: WriteFile failed.\n"));\r
+    DEBUG ((DEBUG_INIT, "ReadBlocks: WriteFile failed.\n"));\r
     Status = EmuBlockIoError (Private);\r
     goto Done;\r
   }\r
@@ -698,5 +698,3 @@ EMU_IO_THUNK_PROTOCOL gBlockIoThunkIo = {
   GasketBlockIoThunkClose,\r
   NULL\r
 };\r
-\r
-\r

diff --git a/EmulatorPkg/Win/Host/WinBlockIo.c b/EmulatorPkg/Win/Host/WinBlockIo.c
index 715d0c26cdbce3c43fc4013f281dcf6ddcec1adb..f602a6a01d8bd00834ca8b62e4b8e4ab453eefbc 100644 (file)
--- a/EmulatorPkg/Win/Host/WinBlockIo.c
+++ b/EmulatorPkg/Win/Host/WinBlockIo.c
@@ -106,7 +106,7 @@ WinNtBlockIoOpenDevice (
   );\r
 \r
   if (Private->NtHandle == INVALID_HANDLE_VALUE) {\r
-    DEBUG ((EFI_D_INFO, "OpenBlock: Could not open %S, %x\n", Private->FileName, GetLastError ()));\r
+    DEBUG ((DEBUG_INFO, "OpenBlock: Could not open %S, %x\n", Private->FileName, GetLastError ()));\r
     Media->MediaPresent = FALSE;\r
     Status = EFI_NO_MEDIA;\r
     goto Done;\r
@@ -118,14 +118,14 @@ WinNtBlockIoOpenDevice (
   Status = SetFilePointer64 (Private, 0, &FileSize, FILE_END);\r
 \r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "OpenBlock: Could not get filesize of %s\n", Private->FileName));\r
+    DEBUG ((DEBUG_ERROR, "OpenBlock: Could not get filesize of %s\n", Private->FileName));\r
     Status = EFI_UNSUPPORTED;\r
     goto Done;\r
   }\r
 \r
   Media->LastBlock = DivU64x32 (FileSize, (UINT32)Private->BlockSize) - 1;\r
 \r
-  DEBUG ((EFI_D_INIT, "OpenBlock: opened %S\n", Private->FileName));\r
+  DEBUG ((DEBUG_INIT, "OpenBlock: opened %S\n", Private->FileName));\r
   Status = EFI_SUCCESS;\r
 \r
 Done:\r
@@ -310,7 +310,7 @@ WinNtBlockIoReadBlocks (
   Status = SetFilePointer64 (Private, DistanceToMove, &DistanceMoved, FILE_BEGIN);\r
 \r
   if (EFI_ERROR (Status) || (DistanceToMove != DistanceMoved)) {\r
-    DEBUG ((EFI_D_INIT, "ReadBlocks: SetFilePointer failed\n"));\r
+    DEBUG ((DEBUG_INIT, "ReadBlocks: SetFilePointer failed\n"));\r
     return WinNtBlockIoError (Private->Media);\r
   }\r
 \r
@@ -381,7 +381,7 @@ WinNtBlockIoWriteBlocks (
   Status = SetFilePointer64 (Private, DistanceToMove, &DistanceMoved, FILE_BEGIN);\r
 \r
   if (EFI_ERROR (Status) || (DistanceToMove != DistanceMoved)) {\r
-    DEBUG ((EFI_D_INIT, "WriteBlocks: SetFilePointer failed\n"));\r
+    DEBUG ((DEBUG_INIT, "WriteBlocks: SetFilePointer failed\n"));\r
     return WinNtBlockIoError (Private->Media);\r
   }\r
 \r
@@ -553,5 +553,3 @@ EMU_IO_THUNK_PROTOCOL mWinNtBlockIoThunkIo = {
   WinNtBlockIoThunkClose,\r
   NULL\r
 };\r
-\r
-\r