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>

8 files changed, 19 insertions, 25 deletions

diff --git a/EmulatorPkg/AutoScanPei/AutoScanPei.c b/EmulatorPkg/AutoScanPei/AutoScanPei.c
index c5e190a93c..eec04fc88d 100644
--- a/EmulatorPkg/AutoScanPei/AutoScanPei.c
+++ b/EmulatorPkg/AutoScanPei/AutoScanPei.c
@@ -47,7 +47,7 @@ Returns:
   EFI_RESOURCE_ATTRIBUTE_TYPE Attributes;

 

 

-  DEBUG ((EFI_D_ERROR, "Emu Autoscan PEIM Loaded\n"));

+  DEBUG ((DEBUG_ERROR, "Emu Autoscan PEIM Loaded\n"));

 

   //

   // Get the PEI UNIX Autoscan PPI

diff --git a/EmulatorPkg/BootModePei/BootModePei.c b/EmulatorPkg/BootModePei/BootModePei.c
index a008a2331d..d523a5f873 100644
--- a/EmulatorPkg/BootModePei/BootModePei.c
+++ b/EmulatorPkg/BootModePei/BootModePei.c
@@ -69,7 +69,7 @@ Returns:
   EFI_STATUS    Status;

   EFI_BOOT_MODE BootMode;

 

-  DEBUG ((EFI_D_ERROR, "Emu Boot Mode PEIM Loaded\n"));

+  DEBUG ((DEBUG_ERROR, "Emu Boot Mode PEIM Loaded\n"));

 

   BootMode  = FixedPcdGet32 (PcdEmuBootMode);

 

diff --git a/EmulatorPkg/FirmwareVolumePei/FirmwareVolumePei.c b/EmulatorPkg/FirmwareVolumePei/FirmwareVolumePei.c
index 4178111096..4a3bfb226c 100644
--- a/EmulatorPkg/FirmwareVolumePei/FirmwareVolumePei.c
+++ b/EmulatorPkg/FirmwareVolumePei/FirmwareVolumePei.c
@@ -44,7 +44,7 @@ Returns:
   UINT64                      FdSize;

   UINTN                       Index;

 

-  DEBUG ((EFI_D_ERROR, "Unix Firmware Volume PEIM Loaded\n"));

+  DEBUG ((DEBUG_ERROR, "Unix Firmware Volume PEIM Loaded\n"));

 

   //

   // Get the Fwh Information PPI

diff --git a/EmulatorPkg/FlashMapPei/FlashMapPei.c b/EmulatorPkg/FlashMapPei/FlashMapPei.c
index 7744065dd6..2be0627fd9 100644
--- a/EmulatorPkg/FlashMapPei/FlashMapPei.c
+++ b/EmulatorPkg/FlashMapPei/FlashMapPei.c
@@ -48,7 +48,7 @@ Returns:
   EFI_PHYSICAL_ADDRESS    FdFixUp;

   UINT64                  FdSize;

 

-  DEBUG ((EFI_D_ERROR, "EmulatorPkg Flash Map PEIM Loaded\n"));

+  DEBUG ((DEBUG_ERROR, "EmulatorPkg Flash Map PEIM Loaded\n"));

 

   //

   // Get the Fwh Information PPI

diff --git a/EmulatorPkg/Sec/Sec.c b/EmulatorPkg/Sec/Sec.c
index 1c0f73d669..e1bee4f6b4 100644
--- a/EmulatorPkg/Sec/Sec.c
+++ b/EmulatorPkg/Sec/Sec.c
@@ -80,7 +80,7 @@ _ModuleEntryPoint (
   EMU_MAGIC_PAGE()->PpiList = PpiList;

   ProcessLibraryConstructorList ();

 

-  DEBUG ((EFI_D_ERROR, "SEC Has Started\n"));

+  DEBUG ((DEBUG_ERROR, "SEC Has Started\n"));

 

   //

   // Add Our PPIs to the list

@@ -136,5 +136,3 @@ _ModuleEntryPoint (
   ASSERT (FALSE);

   return;

 }

-

-

diff --git a/EmulatorPkg/ThunkPpiToProtocolPei/ThunkPpiToProtocolPei.c b/EmulatorPkg/ThunkPpiToProtocolPei/ThunkPpiToProtocolPei.c
index f168811adf..966da3b226 100644
--- a/EmulatorPkg/ThunkPpiToProtocolPei/ThunkPpiToProtocolPei.c
+++ b/EmulatorPkg/ThunkPpiToProtocolPei/ThunkPpiToProtocolPei.c
@@ -47,7 +47,7 @@ Returns:
   EMU_THUNK_PPI           *Thunk;

   VOID                    *Ptr;

 

-  DEBUG ((EFI_D_ERROR, "Emu Thunk PEIM Loaded\n"));

+  DEBUG ((DEBUG_ERROR, "Emu Thunk PEIM Loaded\n"));

 

   Status = PeiServicesLocatePpi (

               &gEmuThunkPpiGuid,        // GUID

diff --git a/EmulatorPkg/Unix/Host/BlockIo.c b/EmulatorPkg/Unix/Host/BlockIo.c
index 18368060d5..e3d7c52a43 100644
--- a/EmulatorPkg/Unix/Host/BlockIo.c
+++ b/EmulatorPkg/Unix/Host/BlockIo.c
@@ -166,7 +166,7 @@ EmuBlockIoOpenDevice (
     }

   }

 

-  DEBUG ((EFI_D_INIT, "%HEmuOpenBlock: opened %a%N\n", Private->Filename));

+  DEBUG ((DEBUG_INIT, "%HEmuOpenBlock: opened %a%N\n", Private->Filename));

   Status = EFI_SUCCESS;

 

 Done:

@@ -282,7 +282,7 @@ EmuBlockIoReadWriteCommon (
   }

 

   if (!Private->Media->MediaPresent) {

-    DEBUG ((EFI_D_INIT, "%s: No Media\n", CallerName));

+    DEBUG ((DEBUG_INIT, "%s: No Media\n", CallerName));

     return EFI_NO_MEDIA;

   }

 

@@ -299,18 +299,18 @@ EmuBlockIoReadWriteCommon (
   //

   BlockSize = Private->Media->BlockSize;

   if (BufferSize == 0) {

-    DEBUG ((EFI_D_INIT, "%s: Zero length read\n", CallerName));

+    DEBUG ((DEBUG_INIT, "%s: Zero length read\n", CallerName));

     return EFI_SUCCESS;

   }

 

   if ((BufferSize % BlockSize) != 0) {

-    DEBUG ((EFI_D_INIT, "%s: Invalid read size\n", CallerName));

+    DEBUG ((DEBUG_INIT, "%s: Invalid read size\n", CallerName));

     return EFI_BAD_BUFFER_SIZE;

   }

 

   LastBlock = Lba + (BufferSize / BlockSize) - 1;

   if (LastBlock > Private->Media->LastBlock) {

-    DEBUG ((EFI_D_INIT, "ReadBlocks: Attempted to read off end of device\n"));

+    DEBUG ((DEBUG_INIT, "ReadBlocks: Attempted to read off end of device\n"));

     return EFI_INVALID_PARAMETER;

   }

   //

@@ -320,7 +320,7 @@ EmuBlockIoReadWriteCommon (
   Status = SetFilePointer64 (Private, DistanceToMove, &DistanceMoved, SEEK_SET);

 

   if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_INIT, "WriteBlocks: SetFilePointer failed\n"));

+    DEBUG ((DEBUG_INIT, "WriteBlocks: SetFilePointer failed\n"));

     return EmuBlockIoError (Private);

   }

 

@@ -384,7 +384,7 @@ EmuBlockIoReadBlocks (
 

   len = read (Private->fd, Buffer, BufferSize);

   if (len != BufferSize) {

-    DEBUG ((EFI_D_INIT, "ReadBlocks: ReadFile failed.\n"));

+    DEBUG ((DEBUG_INIT, "ReadBlocks: ReadFile failed.\n"));

     Status = EmuBlockIoError (Private);

     goto Done;

   }

@@ -462,7 +462,7 @@ EmuBlockIoWriteBlocks (
 

   len = write (Private->fd, Buffer, BufferSize);

   if (len != BufferSize) {

-    DEBUG ((EFI_D_INIT, "ReadBlocks: WriteFile failed.\n"));

+    DEBUG ((DEBUG_INIT, "ReadBlocks: WriteFile failed.\n"));

     Status = EmuBlockIoError (Private);

     goto Done;

   }

@@ -698,5 +698,3 @@ EMU_IO_THUNK_PROTOCOL gBlockIoThunkIo = {
   GasketBlockIoThunkClose,

   NULL

 };

-

-

diff --git a/EmulatorPkg/Win/Host/WinBlockIo.c b/EmulatorPkg/Win/Host/WinBlockIo.c
index 715d0c26cd..f602a6a01d 100644
--- a/EmulatorPkg/Win/Host/WinBlockIo.c
+++ b/EmulatorPkg/Win/Host/WinBlockIo.c
@@ -106,7 +106,7 @@ WinNtBlockIoOpenDevice (
   );

 

   if (Private->NtHandle == INVALID_HANDLE_VALUE) {

-    DEBUG ((EFI_D_INFO, "OpenBlock: Could not open %S, %x\n", Private->FileName, GetLastError ()));

+    DEBUG ((DEBUG_INFO, "OpenBlock: Could not open %S, %x\n", Private->FileName, GetLastError ()));

     Media->MediaPresent = FALSE;

     Status = EFI_NO_MEDIA;

     goto Done;

@@ -118,14 +118,14 @@ WinNtBlockIoOpenDevice (
   Status = SetFilePointer64 (Private, 0, &FileSize, FILE_END);

 

   if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_ERROR, "OpenBlock: Could not get filesize of %s\n", Private->FileName));

+    DEBUG ((DEBUG_ERROR, "OpenBlock: Could not get filesize of %s\n", Private->FileName));

     Status = EFI_UNSUPPORTED;

     goto Done;

   }

 

   Media->LastBlock = DivU64x32 (FileSize, (UINT32)Private->BlockSize) - 1;

 

-  DEBUG ((EFI_D_INIT, "OpenBlock: opened %S\n", Private->FileName));

+  DEBUG ((DEBUG_INIT, "OpenBlock: opened %S\n", Private->FileName));

   Status = EFI_SUCCESS;

 

 Done:

@@ -310,7 +310,7 @@ WinNtBlockIoReadBlocks (
   Status = SetFilePointer64 (Private, DistanceToMove, &DistanceMoved, FILE_BEGIN);

 

   if (EFI_ERROR (Status) || (DistanceToMove != DistanceMoved)) {

-    DEBUG ((EFI_D_INIT, "ReadBlocks: SetFilePointer failed\n"));

+    DEBUG ((DEBUG_INIT, "ReadBlocks: SetFilePointer failed\n"));

     return WinNtBlockIoError (Private->Media);

   }

 

@@ -381,7 +381,7 @@ WinNtBlockIoWriteBlocks (
   Status = SetFilePointer64 (Private, DistanceToMove, &DistanceMoved, FILE_BEGIN);

 

   if (EFI_ERROR (Status) || (DistanceToMove != DistanceMoved)) {

-    DEBUG ((EFI_D_INIT, "WriteBlocks: SetFilePointer failed\n"));

+    DEBUG ((DEBUG_INIT, "WriteBlocks: SetFilePointer failed\n"));

     return WinNtBlockIoError (Private->Media);

   }

 

@@ -553,5 +553,3 @@ EMU_IO_THUNK_PROTOCOL mWinNtBlockIoThunkIo = {
   WinNtBlockIoThunkClose,

   NULL

 };

-

-