NetworkPkg: 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: Maciej Rabeda <maciej.rabeda@linux.intel.com>

15 files changed, 69 insertions, 69 deletions

diff --git a/NetworkPkg/SnpDxe/Callback.c b/NetworkPkg/SnpDxe/Callback.c
index 99b7fd3ef8..1b70b935d0 100644
--- a/NetworkPkg/SnpDxe/Callback.c
+++ b/NetworkPkg/SnpDxe/Callback.c
@@ -246,7 +246,7 @@ SnpUndi32CallbackMap (
   }

 

   if (Index >= MAX_MAP_LENGTH) {

-    DEBUG ((EFI_D_INFO, "SNP maplist is FULL\n"));

+    DEBUG ((DEBUG_INFO, "SNP maplist is FULL\n"));

     *DevAddrPtr = 0;

     return ;

   }

@@ -306,7 +306,7 @@ SnpUndi32CallbackUnmap (
   }

 

   if (Index >= MAX_MAP_LENGTH) {

-    DEBUG ((EFI_D_ERROR, "SNP could not find a mapping, failed to unmap.\n"));

+    DEBUG ((DEBUG_ERROR, "SNP could not find a mapping, failed to unmap.\n"));

     return ;

   }

 

diff --git a/NetworkPkg/SnpDxe/Get_status.c b/NetworkPkg/SnpDxe/Get_status.c
index be6608a0b3..e958ae2575 100644
--- a/NetworkPkg/SnpDxe/Get_status.c
+++ b/NetworkPkg/SnpDxe/Get_status.c
@@ -71,13 +71,13 @@ PxeGetStatus (
   //

   // Issue UNDI command and check result.

   //

-  DEBUG ((EFI_D_NET, "\nSnp->undi.get_status()  "));

+  DEBUG ((DEBUG_NET, "\nSnp->undi.get_status()  "));

 

   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);

 

   if (Snp->Cdb.StatCode != PXE_STATCODE_SUCCESS) {

     DEBUG (

-      (EFI_D_NET,

+      (DEBUG_NET,

       "\nSnp->undi.get_status()  %xh:%xh\n",

       Snp->Cdb.StatFlags,

       Snp->Cdb.StatCode)

diff --git a/NetworkPkg/SnpDxe/Initialize.c b/NetworkPkg/SnpDxe/Initialize.c
index 4d33154241..5ff9d72f1d 100644
--- a/NetworkPkg/SnpDxe/Initialize.c
+++ b/NetworkPkg/SnpDxe/Initialize.c
@@ -46,7 +46,7 @@ PxeInit (
 

     if (Status != EFI_SUCCESS) {

       DEBUG (

-        (EFI_D_ERROR,

+        (DEBUG_ERROR,

         "\nSnp->PxeInit()  AllocateBuffer  %xh (%r)\n",

         Status,

         Status)

@@ -91,7 +91,7 @@ PxeInit (
   Snp->Cdb.IFnum      = Snp->IfNum;

   Snp->Cdb.Control    = PXE_CONTROL_LAST_CDB_IN_LIST;

 

-  DEBUG ((EFI_D_NET, "\nSnp->undi.initialize()  "));

+  DEBUG ((DEBUG_NET, "\nSnp->undi.initialize()  "));

 

   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);

 

@@ -121,7 +121,7 @@ PxeInit (
     Status            = EFI_SUCCESS;

   } else {

     DEBUG (

-      (EFI_D_WARN,

+      (DEBUG_WARN,

       "\nSnp->undi.initialize()  %xh:%xh\n",

       Snp->Cdb.StatFlags,

       Snp->Cdb.StatCode)

diff --git a/NetworkPkg/SnpDxe/Mcast_ip_to_mac.c b/NetworkPkg/SnpDxe/Mcast_ip_to_mac.c
index 9863c1f9ea..e8fa077ee9 100644
--- a/NetworkPkg/SnpDxe/Mcast_ip_to_mac.c
+++ b/NetworkPkg/SnpDxe/Mcast_ip_to_mac.c
@@ -55,7 +55,7 @@ PxeIp2Mac (
   //

   // Issue UNDI command and check result.

   //

-  DEBUG ((EFI_D_NET, "\nSnp->undi.mcast_ip_to_mac()  "));

+  DEBUG ((DEBUG_NET, "\nSnp->undi.mcast_ip_to_mac()  "));

 

   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);

 

@@ -68,7 +68,7 @@ PxeIp2Mac (
 

   case PXE_STATCODE_UNSUPPORTED:

     DEBUG (

-      (EFI_D_NET,

+      (DEBUG_NET,

       "\nSnp->undi.mcast_ip_to_mac()  %xh:%xh\n",

       Snp->Cdb.StatFlags,

       Snp->Cdb.StatCode)

@@ -81,7 +81,7 @@ PxeIp2Mac (
     // to caller.

     //

     DEBUG (

-      (EFI_D_NET,

+      (DEBUG_NET,

       "\nSnp->undi.mcast_ip_to_mac()  %xh:%xh\n",

       Snp->Cdb.StatFlags,

       Snp->Cdb.StatCode)

diff --git a/NetworkPkg/SnpDxe/Nvdata.c b/NetworkPkg/SnpDxe/Nvdata.c
index 7010b63a54..2ffe1c75a2 100644
--- a/NetworkPkg/SnpDxe/Nvdata.c
+++ b/NetworkPkg/SnpDxe/Nvdata.c
@@ -53,7 +53,7 @@ PxeNvDataRead (
   //

   // Issue UNDI command and check result.

   //

-  DEBUG ((EFI_D_NET, "\nsnp->undi.nvdata ()  "));

+  DEBUG ((DEBUG_NET, "\nsnp->undi.nvdata ()  "));

 

   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);

 

@@ -63,7 +63,7 @@ PxeNvDataRead (
 

   case PXE_STATCODE_UNSUPPORTED:

     DEBUG (

-      (EFI_D_NET,

+      (DEBUG_NET,

       "\nsnp->undi.nvdata()  %xh:%xh\n",

       Snp->Cdb.StatFlags,

       Snp->Cdb.StatCode)

@@ -73,7 +73,7 @@ PxeNvDataRead (
 

   default:

     DEBUG (

-      (EFI_D_NET,

+      (DEBUG_NET,

       "\nsnp->undi.nvdata()  %xh:%xh\n",

       Snp->Cdb.StatFlags,

       Snp->Cdb.StatCode)

diff --git a/NetworkPkg/SnpDxe/Receive.c b/NetworkPkg/SnpDxe/Receive.c
index 28cea0d2e9..1efb2ad8db 100644
--- a/NetworkPkg/SnpDxe/Receive.c
+++ b/NetworkPkg/SnpDxe/Receive.c
@@ -76,7 +76,7 @@ PxeReceive (
   //

   // Issue UNDI command and check result.

   //

-  DEBUG ((EFI_D_NET, "\nsnp->undi.receive ()  "));

+  DEBUG ((DEBUG_NET, "\nsnp->undi.receive ()  "));

 

   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);

 

@@ -86,7 +86,7 @@ PxeReceive (
 

   case PXE_STATCODE_NO_DATA:

     DEBUG (

-      (EFI_D_NET,

+      (DEBUG_NET,

       "\nsnp->undi.receive ()  %xh:%xh\n",

       Snp->Cdb.StatFlags,

       Snp->Cdb.StatCode)

@@ -96,7 +96,7 @@ PxeReceive (
 

   default:

     DEBUG (

-      (EFI_D_ERROR,

+      (DEBUG_ERROR,

       "\nsnp->undi.receive()  %xh:%xh\n",

       Snp->Cdb.StatFlags,

       Snp->Cdb.StatCode)

diff --git a/NetworkPkg/SnpDxe/Receive_filters.c b/NetworkPkg/SnpDxe/Receive_filters.c
index 494d2709b6..ec18b74b35 100644
--- a/NetworkPkg/SnpDxe/Receive_filters.c
+++ b/NetworkPkg/SnpDxe/Receive_filters.c
@@ -73,7 +73,7 @@ PxeRecvFilterEnable (
   //

   // Issue UNDI command and check result.

   //

-  DEBUG ((EFI_D_NET, "\nsnp->undi.receive_filters()  "));

+  DEBUG ((DEBUG_NET, "\nsnp->undi.receive_filters()  "));

 

   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);

 

@@ -82,7 +82,7 @@ PxeRecvFilterEnable (
     // UNDI command failed.  Return UNDI status to caller.

     //

     DEBUG (

-      (EFI_D_ERROR,

+      (DEBUG_ERROR,

       "\nsnp->undi.receive_filters()  %xh:%xh\n",

       Snp->Cdb.StatFlags,

       Snp->Cdb.StatCode)

@@ -161,7 +161,7 @@ PxeRecvFilterDisable (
   //

   // Issue UNDI command and check result.

   //

-  DEBUG ((EFI_D_NET, "\nsnp->undi.receive_filters()  "));

+  DEBUG ((DEBUG_NET, "\nsnp->undi.receive_filters()  "));

 

   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);

 

@@ -170,7 +170,7 @@ PxeRecvFilterDisable (
     // UNDI command failed.  Return UNDI status to caller.

     //

     DEBUG (

-      (EFI_D_ERROR,

+      (DEBUG_ERROR,

       "\nsnp->undi.receive_filters()  %xh:%xh\n",

       Snp->Cdb.StatFlags,

       Snp->Cdb.StatCode)

@@ -213,7 +213,7 @@ PxeRecvFilterRead (
   Snp->Cdb.IFnum      = Snp->IfNum;

   Snp->Cdb.Control    = PXE_CONTROL_LAST_CDB_IN_LIST;

 

-  DEBUG ((EFI_D_NET, "\nsnp->undi.receive_filters()  "));

+  DEBUG ((DEBUG_NET, "\nsnp->undi.receive_filters()  "));

 

   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);

 

@@ -222,7 +222,7 @@ PxeRecvFilterRead (
     // UNDI command failed.  Return UNDI status to caller.

     //

     DEBUG (

-      (EFI_D_ERROR,

+      (DEBUG_ERROR,

       "\nsnp->undi.receive_filters()  %xh:%xh\n",

       Snp->Cdb.StatFlags,

       Snp->Cdb.StatCode)

diff --git a/NetworkPkg/SnpDxe/Reset.c b/NetworkPkg/SnpDxe/Reset.c
index 3069bfde66..40069c8722 100644
--- a/NetworkPkg/SnpDxe/Reset.c
+++ b/NetworkPkg/SnpDxe/Reset.c
@@ -37,13 +37,13 @@ PxeReset (
   //

   // Issue UNDI command and check result.

   //

-  DEBUG ((EFI_D_NET, "\nsnp->undi.reset()  "));

+  DEBUG ((DEBUG_NET, "\nsnp->undi.reset()  "));

 

   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);

 

   if (Snp->Cdb.StatCode != PXE_STATCODE_SUCCESS) {

     DEBUG (

-      (EFI_D_WARN,

+      (DEBUG_WARN,

       "\nsnp->undi32.reset()  %xh:%xh\n",

       Snp->Cdb.StatFlags,

       Snp->Cdb.StatCode)

@@ -98,7 +98,7 @@ SnpUndi32Reset (
   // Resolve Warning 4 unreferenced parameter problem

   //

   ExtendedVerification = 0;

-  DEBUG ((EFI_D_WARN, "ExtendedVerification = %d is not implemented!\n", ExtendedVerification));

+  DEBUG ((DEBUG_WARN, "ExtendedVerification = %d is not implemented!\n", ExtendedVerification));

 

   if (This == NULL) {

     return EFI_INVALID_PARAMETER;

diff --git a/NetworkPkg/SnpDxe/Shutdown.c b/NetworkPkg/SnpDxe/Shutdown.c
index ae823fd352..ae6c93a00b 100644
--- a/NetworkPkg/SnpDxe/Shutdown.c
+++ b/NetworkPkg/SnpDxe/Shutdown.c
@@ -37,7 +37,7 @@ PxeShutdown (
   //

   // Issue UNDI command and check result.

   //

-  DEBUG ((EFI_D_NET, "\nsnp->undi.shutdown()  "));

+  DEBUG ((DEBUG_NET, "\nsnp->undi.shutdown()  "));

 

   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);

 

@@ -45,7 +45,7 @@ PxeShutdown (
     //

     // UNDI could not be shutdown. Return UNDI error.

     //

-    DEBUG ((EFI_D_WARN, "\nsnp->undi.shutdown()  %xh:%xh\n", Snp->Cdb.StatFlags, Snp->Cdb.StatCode));

+    DEBUG ((DEBUG_WARN, "\nsnp->undi.shutdown()  %xh:%xh\n", Snp->Cdb.StatFlags, Snp->Cdb.StatCode));

 

     return EFI_DEVICE_ERROR;

   }

diff --git a/NetworkPkg/SnpDxe/Snp.c b/NetworkPkg/SnpDxe/Snp.c
index 69e74132ed..d0d086e578 100644
--- a/NetworkPkg/SnpDxe/Snp.c
+++ b/NetworkPkg/SnpDxe/Snp.c
@@ -50,7 +50,7 @@ IssueHwUndiCommand (
   UINT64 Cdb

   )

 {

-  DEBUG ((EFI_D_ERROR, "\nIssueHwUndiCommand() - This should not be called!"));

+  DEBUG ((DEBUG_ERROR, "\nIssueHwUndiCommand() - This should not be called!"));

 

   if (Cdb == 0) {

     return EFI_INVALID_PARAMETER;

@@ -149,12 +149,12 @@ SimpleNetworkDriverSupported (
 

   if (EFI_ERROR (Status)) {

     if (Status == EFI_ALREADY_STARTED) {

-      DEBUG ((EFI_D_INFO, "Support(): Already Started. on handle %p\n", Controller));

+      DEBUG ((DEBUG_INFO, "Support(): Already Started. on handle %p\n", Controller));

     }

     return Status;

   }

 

-  DEBUG ((EFI_D_INFO, "Support(): UNDI3.1 found on handle %p\n", Controller));

+  DEBUG ((DEBUG_INFO, "Support(): UNDI3.1 found on handle %p\n", Controller));

 

   //

   // check the version, we don't want to connect to the undi16

@@ -167,7 +167,7 @@ SimpleNetworkDriverSupported (
   // Check to see if !PXE structure is valid. Paragraph alignment of !PXE structure is required.

   //

   if ((NiiProtocol->Id & 0x0F) != 0) {

-    DEBUG ((EFI_D_NET, "\n!PXE structure is not paragraph aligned.\n"));

+    DEBUG ((DEBUG_NET, "\n!PXE structure is not paragraph aligned.\n"));

     Status = EFI_UNSUPPORTED;

     goto Done;

   }

@@ -178,25 +178,25 @@ SimpleNetworkDriverSupported (
   //  Verify !PXE revisions.

   //

   if (Pxe->hw.Signature != PXE_ROMID_SIGNATURE) {

-    DEBUG ((EFI_D_NET, "\n!PXE signature is not valid.\n"));

+    DEBUG ((DEBUG_NET, "\n!PXE signature is not valid.\n"));

     Status = EFI_UNSUPPORTED;

     goto Done;

   }

 

   if (Pxe->hw.Rev < PXE_ROMID_REV) {

-    DEBUG ((EFI_D_NET, "\n!PXE.Rev is not supported.\n"));

+    DEBUG ((DEBUG_NET, "\n!PXE.Rev is not supported.\n"));

     Status = EFI_UNSUPPORTED;

     goto Done;

   }

 

   if (Pxe->hw.MajorVer < PXE_ROMID_MAJORVER) {

 

-    DEBUG ((EFI_D_NET, "\n!PXE.MajorVer is not supported.\n"));

+    DEBUG ((DEBUG_NET, "\n!PXE.MajorVer is not supported.\n"));

     Status = EFI_UNSUPPORTED;

     goto Done;

 

   } else if (Pxe->hw.MajorVer == PXE_ROMID_MAJORVER && Pxe->hw.MinorVer < PXE_ROMID_MINORVER) {

-    DEBUG ((EFI_D_NET, "\n!PXE.MinorVer is not supported."));

+    DEBUG ((DEBUG_NET, "\n!PXE.MinorVer is not supported."));

     Status = EFI_UNSUPPORTED;

     goto Done;

   }

@@ -205,20 +205,20 @@ SimpleNetworkDriverSupported (
   //

   if ((Pxe->hw.Implementation & PXE_ROMID_IMP_HW_UNDI) == 0) {

     if (Pxe->sw.EntryPoint < Pxe->sw.Len) {

-      DEBUG ((EFI_D_NET, "\n!PXE S/W entry point is not valid."));

+      DEBUG ((DEBUG_NET, "\n!PXE S/W entry point is not valid."));

       Status = EFI_UNSUPPORTED;

       goto Done;

     }

 

     if (Pxe->sw.BusCnt == 0) {

-      DEBUG ((EFI_D_NET, "\n!PXE.BusCnt is zero."));

+      DEBUG ((DEBUG_NET, "\n!PXE.BusCnt is zero."));

       Status = EFI_UNSUPPORTED;

       goto Done;

     }

   }

 

   Status = EFI_SUCCESS;

-  DEBUG ((EFI_D_INFO, "Support(): supported on %p\n", Controller));

+  DEBUG ((DEBUG_INFO, "Support(): supported on %p\n", Controller));

 

 Done:

   gBS->CloseProtocol (

@@ -271,7 +271,7 @@ SimpleNetworkDriverStart (
   BOOLEAN                                   FoundIoBar;

   BOOLEAN                                   FoundMemoryBar;

 

-  DEBUG ((EFI_D_NET, "\nSnpNotifyNetworkInterfaceIdentifier()  "));

+  DEBUG ((DEBUG_NET, "\nSnpNotifyNetworkInterfaceIdentifier()  "));

 

   Status = gBS->OpenProtocol (

                   Controller,

@@ -328,12 +328,12 @@ SimpleNetworkDriverStart (
     return Status;

   }

 

-  DEBUG ((EFI_D_INFO, "Start(): UNDI3.1 found\n"));

+  DEBUG ((DEBUG_INFO, "Start(): UNDI3.1 found\n"));

 

   Pxe = (PXE_UNDI *) (UINTN) (Nii->Id);

 

   if (Calc8BitCksum (Pxe, Pxe->hw.Len) != 0) {

-    DEBUG ((EFI_D_NET, "\n!PXE checksum is not correct.\n"));

+    DEBUG ((DEBUG_NET, "\n!PXE checksum is not correct.\n"));

     goto NiiError;

   }

 

@@ -348,7 +348,7 @@ SimpleNetworkDriverStart (
     //  broadcast support or we cannot do DHCP!

     //

   } else {

-    DEBUG ((EFI_D_NET, "\nUNDI does not have promiscuous or broadcast support."));

+    DEBUG ((DEBUG_NET, "\nUNDI does not have promiscuous or broadcast support."));

     goto NiiError;

   }

   //

@@ -365,7 +365,7 @@ SimpleNetworkDriverStart (
                     );

 

   if (Status != EFI_SUCCESS) {

-    DEBUG ((EFI_D_NET, "\nCould not allocate SNP_DRIVER structure.\n"));

+    DEBUG ((DEBUG_NET, "\nCould not allocate SNP_DRIVER structure.\n"));

     goto NiiError;

   }

 

@@ -452,7 +452,7 @@ SimpleNetworkDriverStart (
                     );

 

   if (Status != EFI_SUCCESS) {

-    DEBUG ((EFI_D_NET, "\nCould not allocate CPB and DB structures.\n"));

+    DEBUG ((DEBUG_NET, "\nCould not allocate CPB and DB structures.\n"));

     goto Error_DeleteSNP;

   }

 

@@ -519,7 +519,7 @@ SimpleNetworkDriverStart (
   Snp->Cdb.IFnum      = Snp->IfNum;

   Snp->Cdb.Control    = PXE_CONTROL_LAST_CDB_IN_LIST;

 

-  DEBUG ((EFI_D_NET, "\nSnp->undi.get_init_info()  "));

+  DEBUG ((DEBUG_NET, "\nSnp->undi.get_init_info()  "));

 

   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);

 

@@ -529,7 +529,7 @@ SimpleNetworkDriverStart (
   InitStatFlags = Snp->Cdb.StatFlags;

 

   if (Snp->Cdb.StatCode != PXE_STATCODE_SUCCESS) {

-    DEBUG ((EFI_D_NET, "\nSnp->undi.init_info()  %xh:%xh\n", Snp->Cdb.StatFlags, Snp->Cdb.StatCode));

+    DEBUG ((DEBUG_NET, "\nSnp->undi.init_info()  %xh:%xh\n", Snp->Cdb.StatFlags, Snp->Cdb.StatCode));

     PxeStop (Snp);

     goto Error_DeleteSNP;

   }

@@ -627,7 +627,7 @@ SimpleNetworkDriverStart (
   Status = PxeGetStnAddr (Snp);

 

   if (Status != EFI_SUCCESS) {

-    DEBUG ((EFI_D_ERROR, "\nSnp->undi.get_station_addr() failed.\n"));

+    DEBUG ((DEBUG_ERROR, "\nSnp->undi.get_station_addr() failed.\n"));

     PxeShutdown (Snp);

     PxeStop (Snp);

     goto Error_DeleteSNP;

diff --git a/NetworkPkg/SnpDxe/Start.c b/NetworkPkg/SnpDxe/Start.c
index 033ca22f66..596610d1a9 100644
--- a/NetworkPkg/SnpDxe/Start.c
+++ b/NetworkPkg/SnpDxe/Start.c
@@ -66,7 +66,7 @@ PxeStart (
   //

   // Issue UNDI command and check result.

   //

-  DEBUG ((EFI_D_NET, "\nsnp->undi.start()  "));

+  DEBUG ((DEBUG_NET, "\nsnp->undi.start()  "));

 

   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);

 

@@ -75,7 +75,7 @@ PxeStart (
     // UNDI could not be started. Return UNDI error.

     //

     DEBUG (

-      (EFI_D_ERROR,

+      (DEBUG_ERROR,

       "\nsnp->undi.start()  %xh:%xh\n",

       Snp->Cdb.StatCode,

       Snp->Cdb.StatFlags)

diff --git a/NetworkPkg/SnpDxe/Station_address.c b/NetworkPkg/SnpDxe/Station_address.c
index a5c87d4799..c88601e456 100644
--- a/NetworkPkg/SnpDxe/Station_address.c
+++ b/NetworkPkg/SnpDxe/Station_address.c
@@ -44,13 +44,13 @@ PxeGetStnAddr (
   //

   // Issue UNDI command and check result.

   //

-  DEBUG ((EFI_D_NET, "\nsnp->undi.station_addr()  "));

+  DEBUG ((DEBUG_NET, "\nsnp->undi.station_addr()  "));

 

   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);

 

   if (Snp->Cdb.StatCode != PXE_STATCODE_SUCCESS) {

     DEBUG (

-      (EFI_D_ERROR,

+      (DEBUG_ERROR,

       "\nsnp->undi.station_addr()  %xh:%xh\n",

       Snp->Cdb.StatFlags,

       Snp->Cdb.StatCode)

@@ -132,13 +132,13 @@ PxeSetStnAddr (
   //

   // Issue UNDI command and check result.

   //

-  DEBUG ((EFI_D_NET, "\nsnp->undi.station_addr()  "));

+  DEBUG ((DEBUG_NET, "\nsnp->undi.station_addr()  "));

 

   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);

 

   if (Snp->Cdb.StatCode != PXE_STATCODE_SUCCESS) {

     DEBUG (

-      (EFI_D_ERROR,

+      (DEBUG_ERROR,

       "\nsnp->undi.station_addr()  %xh:%xh\n",

       Snp->Cdb.StatFlags,

       Snp->Cdb.StatCode)

diff --git a/NetworkPkg/SnpDxe/Statistics.c b/NetworkPkg/SnpDxe/Statistics.c
index 480e261780..0928eae1c4 100644
--- a/NetworkPkg/SnpDxe/Statistics.c
+++ b/NetworkPkg/SnpDxe/Statistics.c
@@ -133,7 +133,7 @@ SnpUndi32Statistics (
   //

   // Issue UNDI command and check result.

   //

-  DEBUG ((EFI_D_NET, "\nsnp->undi.statistics()  "));

+  DEBUG ((DEBUG_NET, "\nsnp->undi.statistics()  "));

 

   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);

 

@@ -143,7 +143,7 @@ SnpUndi32Statistics (
 

   case PXE_STATCODE_UNSUPPORTED:

     DEBUG (

-      (EFI_D_ERROR,

+      (DEBUG_ERROR,

       "\nsnp->undi.statistics()  %xh:%xh\n",

       Snp->Cdb.StatFlags,

       Snp->Cdb.StatCode)

@@ -154,7 +154,7 @@ SnpUndi32Statistics (
 

   default:

     DEBUG (

-      (EFI_D_ERROR,

+      (DEBUG_ERROR,

       "\nsnp->undi.statistics()  %xh:%xh\n",

       Snp->Cdb.StatFlags,

       Snp->Cdb.StatCode)

diff --git a/NetworkPkg/SnpDxe/Stop.c b/NetworkPkg/SnpDxe/Stop.c
index f1c1bd847c..b45b87cf9c 100644
--- a/NetworkPkg/SnpDxe/Stop.c
+++ b/NetworkPkg/SnpDxe/Stop.c
@@ -37,13 +37,13 @@ PxeStop (
   //

   // Issue UNDI command

   //

-  DEBUG ((EFI_D_NET, "\nsnp->undi.stop()  "));

+  DEBUG ((DEBUG_NET, "\nsnp->undi.stop()  "));

 

   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);

 

   if (Snp->Cdb.StatCode != PXE_STATCODE_SUCCESS) {

     DEBUG (

-      (EFI_D_WARN,

+      (DEBUG_WARN,

       "\nsnp->undi.stop()  %xh:%xh\n",

       Snp->Cdb.StatFlags,

       Snp->Cdb.StatCode)

diff --git a/NetworkPkg/SnpDxe/Transmit.c b/NetworkPkg/SnpDxe/Transmit.c
index 44fdd71f41..0f8d79ac7e 100644
--- a/NetworkPkg/SnpDxe/Transmit.c
+++ b/NetworkPkg/SnpDxe/Transmit.c
@@ -95,7 +95,7 @@ PxeFillHeader (
   //

   // Issue UNDI command and check result.

   //

-  DEBUG ((EFI_D_NET, "\nSnp->undi.fill_header()  "));

+  DEBUG ((DEBUG_NET, "\nSnp->undi.fill_header()  "));

 

   (*Snp->IssueUndi32Command) ((UINT64) (UINTN) &Snp->Cdb);

 

@@ -105,7 +105,7 @@ PxeFillHeader (
 

   case PXE_STATCODE_INVALID_PARAMETER:

     DEBUG (

-      (EFI_D_ERROR,

+      (DEBUG_ERROR,

       "\nSnp->undi.fill_header()  %xh:%xh\n",

       Snp->Cdb.StatFlags,

       Snp->Cdb.StatCode)

@@ -115,7 +115,7 @@ PxeFillHeader (
 

   default:

     DEBUG (

-      (EFI_D_ERROR,

+      (DEBUG_ERROR,

       "\nSnp->undi.fill_header()  %xh:%xh\n",

       Snp->Cdb.StatFlags,

       Snp->Cdb.StatCode)

@@ -171,15 +171,15 @@ PxeTransmit (
   //

   // Issue UNDI command and check result.

   //

-  DEBUG ((EFI_D_NET, "\nSnp->undi.transmit()  "));

-  DEBUG ((EFI_D_NET, "\nSnp->Cdb.OpCode  == %x", Snp->Cdb.OpCode));

-  DEBUG ((EFI_D_NET, "\nSnp->Cdb.CPBaddr == %LX", Snp->Cdb.CPBaddr));

-  DEBUG ((EFI_D_NET, "\nSnp->Cdb.DBaddr  == %LX", Snp->Cdb.DBaddr));

-  DEBUG ((EFI_D_NET, "\nCpb->FrameAddr   == %LX\n", Cpb->FrameAddr));

+  DEBUG ((DEBUG_NET, "\nSnp->undi.transmit()  "));

+  DEBUG ((DEBUG_NET, "\nSnp->Cdb.OpCode  == %x", Snp->Cdb.OpCode));

+  DEBUG ((DEBUG_NET, "\nSnp->Cdb.CPBaddr == %LX", Snp->Cdb.CPBaddr));

+  DEBUG ((DEBUG_NET, "\nSnp->Cdb.DBaddr  == %LX", Snp->Cdb.DBaddr));

+  DEBUG ((DEBUG_NET, "\nCpb->FrameAddr   == %LX\n", Cpb->FrameAddr));

 

   (*Snp->IssueUndi32Command) ((UINT64) (UINTN) &Snp->Cdb);

 

-  DEBUG ((EFI_D_NET, "\nexit Snp->undi.transmit()  "));

+  DEBUG ((DEBUG_NET, "\nexit Snp->undi.transmit()  "));

 

   //

   // we will unmap the buffers in get_status call, not here

@@ -193,7 +193,7 @@ PxeTransmit (
   case PXE_STATCODE_BUSY:

     Status = EFI_NOT_READY;

     DEBUG (

-      (EFI_D_NET,

+      (DEBUG_NET,

       "\nSnp->undi.transmit()  %xh:%xh\n",

       Snp->Cdb.StatFlags,

       Snp->Cdb.StatCode)

@@ -202,7 +202,7 @@ PxeTransmit (
 

   default:

     DEBUG (

-      (EFI_D_ERROR,

+      (DEBUG_ERROR,

       "\nSnp->undi.transmit()  %xh:%xh\n",

       Snp->Cdb.StatFlags,

       Snp->Cdb.StatCode)