EmbeddedPkg: 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: Ard Biesheuvel <ardb@kernel.org>

2 files changed, 23 insertions, 23 deletions

diff --git a/EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcp.c b/EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcp.c
index 34f9ba7..0cf884b 100644
--- a/EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcp.c
+++ b/EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcp.c
@@ -99,7 +99,7 @@ SubmitRecieveToken (
   FragmentBuffer = AllocatePool (RX_FRAGMENT_SIZE);

   ASSERT (FragmentBuffer != NULL);

   if (FragmentBuffer == NULL) {

-    DEBUG ((EFI_D_ERROR, "TCP Fastboot out of resources"));

+    DEBUG ((DEBUG_ERROR, "TCP Fastboot out of resources"));

     return EFI_OUT_OF_RESOURCES;

   }

 

@@ -109,7 +109,7 @@ SubmitRecieveToken (
 

   Status = mTcpConnection->Receive (mTcpConnection, &mReceiveToken[mNextSubmitIndex]);

    if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_ERROR, "TCP Receive: %r\n", Status));

+    DEBUG ((DEBUG_ERROR, "TCP Receive: %r\n", Status));

     FreePool (FragmentBuffer);

   }

 

@@ -140,7 +140,7 @@ ConnectionClosed (
 

   Status = mTcpListener->Accept (mTcpListener, &mAcceptToken);

   if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_ERROR, "TCP Accept: %r\n", Status));

+    DEBUG ((DEBUG_ERROR, "TCP Accept: %r\n", Status));

   }

 }

 

@@ -195,7 +195,7 @@ DataReceived (
 

   NewEntry = AllocatePool (sizeof (FASTBOOT_TCP_PACKET_LIST));

   if (NewEntry == NULL) {

-    DEBUG ((EFI_D_ERROR, "TCP Fastboot: Out of resources\n"));

+    DEBUG ((DEBUG_ERROR, "TCP Fastboot: Out of resources\n"));

     return;

   }

 

@@ -215,7 +215,7 @@ DataReceived (
     NewEntry->Buffer = NULL;

     NewEntry->BufferSize = 0;

 

-    DEBUG ((EFI_D_ERROR, "\nTCP Fastboot Receive error: %r\n", Status));

+    DEBUG ((DEBUG_ERROR, "\nTCP Fastboot Receive error: %r\n", Status));

   }

 

   InsertTailList (&mPacketListHead, &NewEntry->Link);

@@ -244,10 +244,10 @@ ConnectionAccepted (
   Status = AcceptToken->CompletionToken.Status;

 

   if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_ERROR, "TCP Fastboot: Connection Error: %r\n", Status));

+    DEBUG ((DEBUG_ERROR, "TCP Fastboot: Connection Error: %r\n", Status));

     return;

   }

-  DEBUG ((EFI_D_ERROR, "TCP Fastboot: Connection Received.\n"));

+  DEBUG ((DEBUG_ERROR, "TCP Fastboot: Connection Received.\n"));

 

   //

   // Accepting a new TCP connection creates a new instance of the TCP protocol.

@@ -263,7 +263,7 @@ ConnectionAccepted (
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL

                   );

   if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_ERROR, "Open TCP Connection: %r\n", Status));

+    DEBUG ((DEBUG_ERROR, "Open TCP Connection: %r\n", Status));

     return;

   }

 

@@ -335,7 +335,7 @@ TcpFastbootTransportStart (
                   &HandleBuffer

                   );

   if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_ERROR, "Find TCP Service Binding: %r\n", Status));

+    DEBUG ((DEBUG_ERROR, "Find TCP Service Binding: %r\n", Status));

     return Status;

   }

 

@@ -351,13 +351,13 @@ TcpFastbootTransportStart (
                     EFI_OPEN_PROTOCOL_GET_PROTOCOL

                     );

   if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_ERROR, "Open TCP Service Binding: %r\n", Status));

+    DEBUG ((DEBUG_ERROR, "Open TCP Service Binding: %r\n", Status));

     return Status;

   }

 

   Status = mTcpServiceBinding->CreateChild (mTcpServiceBinding, &mTcpHandle);

   if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_ERROR, "TCP ServiceBinding Create: %r\n", Status));

+    DEBUG ((DEBUG_ERROR, "TCP ServiceBinding Create: %r\n", Status));

     return Status;

   }

 

@@ -370,7 +370,7 @@ TcpFastbootTransportStart (
                     EFI_OPEN_PROTOCOL_GET_PROTOCOL

                     );

   if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_ERROR, "Open TCP Protocol: %r\n", Status));

+    DEBUG ((DEBUG_ERROR, "Open TCP Protocol: %r\n", Status));

   }

 

   //

@@ -423,7 +423,7 @@ TcpFastbootTransportStart (
     } while (!Ip4ModeData.IsConfigured);

     Status = mTcpListener->Configure (mTcpListener, &TcpConfigData);

   } else if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_ERROR, "TCP Configure: %r\n", Status));

+    DEBUG ((DEBUG_ERROR, "TCP Configure: %r\n", Status));

     return Status;

   }

 

@@ -443,7 +443,7 @@ TcpFastbootTransportStart (
 

   Status = mTcpListener->Accept (mTcpListener, &mAcceptToken);

   if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_ERROR, "TCP Accept: %r\n", Status));

+    DEBUG ((DEBUG_ERROR, "TCP Accept: %r\n", Status));

     return Status;

   }

 

@@ -539,7 +539,7 @@ DataSent (
 

   Status = mTransmitToken.CompletionToken.Status;

   if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_ERROR, "TCP Fastboot transmit result: %r\n", Status));

+    DEBUG ((DEBUG_ERROR, "TCP Fastboot transmit result: %r\n", Status));

     gBS->SignalEvent (*(EFI_EVENT *) Context);

   }

 

@@ -584,7 +584,7 @@ TcpFastbootTransportSend (
 

   Status = mTcpConnection->Transmit (mTcpConnection, &mTransmitToken);

   if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_ERROR, "TCP Transmit: %r\n", Status));

+    DEBUG ((DEBUG_ERROR, "TCP Transmit: %r\n", Status));

     return Status;

   }

 

@@ -642,7 +642,7 @@ TcpFastbootTransportEntryPoint (
     (VOID **) &mTextOut

     );

   if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_ERROR, "Fastboot: Open Text Output Protocol: %r\n", Status));

+    DEBUG ((DEBUG_ERROR, "Fastboot: Open Text Output Protocol: %r\n", Status));

     return Status;

   }

 

@@ -653,7 +653,7 @@ TcpFastbootTransportEntryPoint (
                   &mTransportProtocol

                   );

   if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_ERROR, "Fastboot: Install transport Protocol: %r\n", Status));

+    DEBUG ((DEBUG_ERROR, "Fastboot: Install transport Protocol: %r\n", Status));

   }

 

   return Status;

diff --git a/EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.c b/EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.c
index 6300d28..45bed5e 100644
--- a/EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.c
+++ b/EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.c
@@ -208,7 +208,7 @@ FindCompatibleNodeReg (
   }

 

   if ((*RegSize % 16) != 0) {

-    DEBUG ((EFI_D_ERROR,

+    DEBUG ((DEBUG_ERROR,

       "%a: '%a' compatible node has invalid 'reg' property (size == 0x%x)\n",

       __FUNCTION__, CompatibleString, *RegSize));

     return EFI_NOT_FOUND;

@@ -261,13 +261,13 @@ FindNextMemoryNodeReg (
       //

       Status = GetNodeProperty (This, Next, "reg", Reg, RegSize);

       if (EFI_ERROR (Status)) {

-        DEBUG ((EFI_D_WARN,

+        DEBUG ((DEBUG_WARN,

           "%a: ignoring memory node with no 'reg' property\n",

           __FUNCTION__));

         continue;

       }

       if ((*RegSize % 16) != 0) {

-        DEBUG ((EFI_D_WARN,

+        DEBUG ((DEBUG_WARN,

           "%a: ignoring memory node with invalid 'reg' property (size == 0x%x)\n",

           __FUNCTION__, *RegSize));

         continue;

@@ -391,14 +391,14 @@ InitializeFdtClientDxe (
   DeviceTreeBase = (VOID *)(UINTN)*(UINT64 *)GET_GUID_HOB_DATA (Hob);

 

   if (fdt_check_header (DeviceTreeBase) != 0) {

-    DEBUG ((EFI_D_ERROR, "%a: No DTB found @ 0x%p\n", __FUNCTION__,

+    DEBUG ((DEBUG_ERROR, "%a: No DTB found @ 0x%p\n", __FUNCTION__,

       DeviceTreeBase));

     return EFI_NOT_FOUND;

   }

 

   mDeviceTreeBase = DeviceTreeBase;

 

-  DEBUG ((EFI_D_INFO, "%a: DTB @ 0x%p\n", __FUNCTION__, mDeviceTreeBase));

+  DEBUG ((DEBUG_INFO, "%a: DTB @ 0x%p\n", __FUNCTION__, mDeviceTreeBase));

 

   //

   // Register a protocol notify for the EDKII Platform Has Device Tree