Roll back the DEBUG mask change which cause SerialIo read_conf test item failure.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7477 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Callback.c b/MdeModulePkg/Universal/Network/SnpDxe/Callback.c
index fc018265c792551f0d18d525634f8126c9701757..c84b542203e3264cb1a9b96c0bd4704b85baad43 100644 (file)
--- a/MdeModulePkg/Universal/Network/SnpDxe/Callback.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/Callback.c
@@ -61,7 +61,7 @@ SnpUndi32CallbackV2p30 (
   // EFI uses identical mapping\r
   //\r
   if ((CpuAddr == 0) || (DeviceAddrPtr == 0)) {\r
   // EFI uses identical mapping\r
   //\r
   if ((CpuAddr == 0) || (DeviceAddrPtr == 0)) {\r

-    DEBUG ((EFI_D_INFO | EFI_D_NET, "\nv2p: Null virtual address or physical pointer.\n"));\r
+    DEBUG ((EFI_D_NET, "\nv2p: Null virtual address or physical pointer.\n"));\r

     return ;\r
   }\r
 \r
     return ;\r
   }\r
 \r

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Get_status.c b/MdeModulePkg/Universal/Network/SnpDxe/Get_status.c
index e2c911dfd2b32dc131c0cdd5d0ac6590619b51f5..edd2424c2cea5f8d7624df3ea490f223c4df04da 100644 (file)
--- a/MdeModulePkg/Universal/Network/SnpDxe/Get_status.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/Get_status.c
@@ -72,13 +72,13 @@ PxeGetStatus (
   //\r
   // Issue UNDI command and check result.\r
   //\r
   //\r
   // Issue UNDI command and check result.\r
   //\r

-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nSnp->undi.get_status()  "));\r
+  DEBUG ((EFI_D_NET, "\nSnp->undi.get_status()  "));\r

 \r
   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);\r
 \r
   if (Snp->Cdb.StatCode != EFI_SUCCESS) {\r
     DEBUG (\r
 \r
   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);\r
 \r
   if (Snp->Cdb.StatCode != EFI_SUCCESS) {\r
     DEBUG (\r

-      (EFI_D_ERROR | EFI_D_NET,\r
+      (EFI_D_NET,\r

       "\nSnp->undi.get_status()  %xh:%xh\n",\r
       Snp->Cdb.StatFlags,\r
       Snp->Cdb.StatFlags)\r
       "\nSnp->undi.get_status()  %xh:%xh\n",\r
       Snp->Cdb.StatFlags,\r
       Snp->Cdb.StatFlags)\r

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Initialize.c b/MdeModulePkg/Universal/Network/SnpDxe/Initialize.c
index 43b517e9e6c1360640a6e831fba894f162fd47b8..6173058e101fd70114fe8d359ec9f15e1ea52f99 100644 (file)
--- a/MdeModulePkg/Universal/Network/SnpDxe/Initialize.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/Initialize.c
@@ -95,7 +95,7 @@ PxeInit (
   Snp->Cdb.IFnum      = Snp->IfNum;\r
   Snp->Cdb.Control    = PXE_CONTROL_LAST_CDB_IN_LIST;\r
 \r
   Snp->Cdb.IFnum      = Snp->IfNum;\r
   Snp->Cdb.Control    = PXE_CONTROL_LAST_CDB_IN_LIST;\r
 \r

-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nSnp->undi.initialize()  "));\r
+  DEBUG ((EFI_D_NET, "\nSnp->undi.initialize()  "));\r

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


@@ -105,7 +105,7 @@ PxeInit (
     Status          = EFI_SUCCESS;\r
   } else {\r
     DEBUG (\r
     Status          = EFI_SUCCESS;\r
   } else {\r
     DEBUG (\r

-      (EFI_D_ERROR,\r
+      (EFI_D_WARN,\r

       "\nSnp->undi.initialize()  %xh:%xh\n",\r
       Snp->Cdb.StatFlags,\r
       Snp->Cdb.StatCode)\r
       "\nSnp->undi.initialize()  %xh:%xh\n",\r
       Snp->Cdb.StatFlags,\r
       Snp->Cdb.StatCode)\r

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Mcast_ip_to_mac.c b/MdeModulePkg/Universal/Network/SnpDxe/Mcast_ip_to_mac.c
index e11b54afaada4f39ede3abd56756cd86fbe79815..a1d701b17bee85e7a0134bd09ac6e823a4e9b878 100644 (file)
--- a/MdeModulePkg/Universal/Network/SnpDxe/Mcast_ip_to_mac.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/Mcast_ip_to_mac.c
@@ -61,7 +61,7 @@ PxeIp2Mac (
   //\r
   // Issue UNDI command and check result.\r
   //\r
   //\r
   // Issue UNDI command and check result.\r
   //\r

-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nSnp->undi.mcast_ip_to_mac()  "));\r
+  DEBUG ((EFI_D_NET, "\nSnp->undi.mcast_ip_to_mac()  "));\r

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


@@ -74,7 +74,7 @@ PxeIp2Mac (
 \r
   case PXE_STATCODE_UNSUPPORTED:\r
     DEBUG (\r
 \r
   case PXE_STATCODE_UNSUPPORTED:\r
     DEBUG (\r

-      (EFI_D_ERROR | EFI_D_NET,\r
+      (EFI_D_NET,\r

       "\nSnp->undi.mcast_ip_to_mac()  %xh:%xh\n",\r
       Snp->Cdb.StatFlags,\r
       Snp->Cdb.StatCode)\r
       "\nSnp->undi.mcast_ip_to_mac()  %xh:%xh\n",\r
       Snp->Cdb.StatFlags,\r
       Snp->Cdb.StatCode)\r


@@ -87,7 +87,7 @@ PxeIp2Mac (
     // to caller.\r
     //\r
     DEBUG (\r
     // to caller.\r
     //\r
     DEBUG (\r

-      (EFI_D_ERROR | EFI_D_NET,\r
+      (EFI_D_NET,\r

       "\nSnp->undi.mcast_ip_to_mac()  %xh:%xh\n",\r
       Snp->Cdb.StatFlags,\r
       Snp->Cdb.StatCode)\r
       "\nSnp->undi.mcast_ip_to_mac()  %xh:%xh\n",\r
       Snp->Cdb.StatFlags,\r
       Snp->Cdb.StatCode)\r

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Nvdata.c b/MdeModulePkg/Universal/Network/SnpDxe/Nvdata.c
index d7c55a6f10d0f4c8a7fcc8b248932fc3660bc65d..9aa02e1a930ac313f9f075cf402c6ccb7f2b86a3 100644 (file)
--- a/MdeModulePkg/Universal/Network/SnpDxe/Nvdata.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/Nvdata.c
@@ -59,7 +59,7 @@ PxeNvDataRead (
   //\r
   // Issue UNDI command and check result.\r
   //\r
   //\r
   // Issue UNDI command and check result.\r
   //\r

-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nsnp->undi.nvdata ()  "));\r
+  DEBUG ((EFI_D_NET, "\nsnp->undi.nvdata ()  "));\r

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


@@ -69,7 +69,7 @@ PxeNvDataRead (
 \r
   case PXE_STATCODE_UNSUPPORTED:\r
     DEBUG (\r
 \r
   case PXE_STATCODE_UNSUPPORTED:\r
     DEBUG (\r

-      (EFI_D_ERROR | EFI_D_NET,\r
+      (EFI_D_NET,\r

       "\nsnp->undi.nvdata()  %xh:%xh\n",\r
       Snp->Cdb.StatFlags,\r
       Snp->Cdb.StatCode)\r
       "\nsnp->undi.nvdata()  %xh:%xh\n",\r
       Snp->Cdb.StatFlags,\r
       Snp->Cdb.StatCode)\r


@@ -79,7 +79,7 @@ PxeNvDataRead (
 \r
   default:\r
     DEBUG (\r
 \r
   default:\r
     DEBUG (\r

-      (EFI_D_ERROR | EFI_D_NET,\r
+      (EFI_D_NET,\r

       "\nsnp->undi.nvdata()  %xh:%xh\n",\r
       Snp->Cdb.StatFlags,\r
       Snp->Cdb.StatCode)\r
       "\nsnp->undi.nvdata()  %xh:%xh\n",\r
       Snp->Cdb.StatFlags,\r
       Snp->Cdb.StatCode)\r

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Receive.c b/MdeModulePkg/Universal/Network/SnpDxe/Receive.c
index 4fec2a2f785681a6282468d60641ad700fa36113..92123b6c1fe76835bc5869a88fd88e008d4c82be 100644 (file)
--- a/MdeModulePkg/Universal/Network/SnpDxe/Receive.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/Receive.c
@@ -102,7 +102,7 @@ PxeReceive (
 \r
   default:\r
     DEBUG (\r
 \r
   default:\r
     DEBUG (\r

-      (EFI_D_NET,\r
+      (EFI_D_ERROR,\r

       "\nsnp->undi.receive()  %xh:%xh\n",\r
       Snp->Cdb.StatFlags,\r
       Snp->Cdb.StatCode)\r
       "\nsnp->undi.receive()  %xh:%xh\n",\r
       Snp->Cdb.StatFlags,\r
       Snp->Cdb.StatCode)\r

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Receive_filters.c b/MdeModulePkg/Universal/Network/SnpDxe/Receive_filters.c
index 24e89c5b484786ce5a6d40aaf33cb5827aa8931f..7ac85bfe7a9187e30fcc69e0d912da192f4007eb 100644 (file)
--- a/MdeModulePkg/Universal/Network/SnpDxe/Receive_filters.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/Receive_filters.c
@@ -79,7 +79,7 @@ PxeRecvFilterEnable (
   //\r
   // Issue UNDI command and check result.\r
   //\r
   //\r
   // Issue UNDI command and check result.\r
   //\r

-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nsnp->undi.receive_filters()  "));\r
+  DEBUG ((EFI_D_NET, "\nsnp->undi.receive_filters()  "));\r

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


@@ -167,7 +167,7 @@ PxeRecvFilterDisable (
   //\r
   // Issue UNDI command and check result.\r
   //\r
   //\r
   // Issue UNDI command and check result.\r
   //\r

-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nsnp->undi.receive_filters()  "));\r
+  DEBUG ((EFI_D_NET, "\nsnp->undi.receive_filters()  "));\r

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


@@ -176,7 +176,7 @@ PxeRecvFilterDisable (
     // UNDI command failed.  Return UNDI status to caller.\r
     //\r
     DEBUG (\r
     // UNDI command failed.  Return UNDI status to caller.\r
     //\r
     DEBUG (\r

-      (EFI_D_ERROR | EFI_D_NET,\r
+      (EFI_D_ERROR,\r

       "\nsnp->undi.receive_filters()  %xh:%xh\n",\r
       Snp->Cdb.StatFlags,\r
       Snp->Cdb.StatCode)\r
       "\nsnp->undi.receive_filters()  %xh:%xh\n",\r
       Snp->Cdb.StatFlags,\r
       Snp->Cdb.StatCode)\r


@@ -219,7 +219,7 @@ PxeRecvFilterRead (
   Snp->Cdb.IFnum      = Snp->IfNum;\r
   Snp->Cdb.Control    = PXE_CONTROL_LAST_CDB_IN_LIST;\r
 \r
   Snp->Cdb.IFnum      = Snp->IfNum;\r
   Snp->Cdb.Control    = PXE_CONTROL_LAST_CDB_IN_LIST;\r
 \r

-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nsnp->undi.receive_filters()  "));\r
+  DEBUG ((EFI_D_NET, "\nsnp->undi.receive_filters()  "));\r

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

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Reset.c b/MdeModulePkg/Universal/Network/SnpDxe/Reset.c
index 057d3b51c5b244be3a3e9313c36de56216c4e38d..5b8bc0d675688fad0ccad5940f9e1450015c8eed 100644 (file)
--- a/MdeModulePkg/Universal/Network/SnpDxe/Reset.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/Reset.c
@@ -43,13 +43,13 @@ PxeReset (
   //\r
   // Issue UNDI command and check result.\r
   //\r
   //\r
   // Issue UNDI command and check result.\r
   //\r

-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nsnp->undi.reset()  "));\r
+  DEBUG ((EFI_D_NET, "\nsnp->undi.reset()  "));\r

 \r
   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);\r
 \r
   if (Snp->Cdb.StatCode != PXE_STATCODE_SUCCESS) {\r
     DEBUG (\r
 \r
   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);\r
 \r
   if (Snp->Cdb.StatCode != PXE_STATCODE_SUCCESS) {\r
     DEBUG (\r

-      (EFI_D_ERROR | EFI_D_NET,\r
+      (EFI_D_WARN,\r

       "\nsnp->undi32.reset()  %xh:%xh\n",\r
       Snp->Cdb.StatFlags,\r
       Snp->Cdb.StatCode)\r
       "\nsnp->undi32.reset()  %xh:%xh\n",\r
       Snp->Cdb.StatFlags,\r
       Snp->Cdb.StatCode)\r

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Shutdown.c b/MdeModulePkg/Universal/Network/SnpDxe/Shutdown.c
index 21ed2bfe206898c83755edbc239632695d1868b5..8f7fb15b383a10e3cd49099d95dd9a76d8be3877 100644 (file)
--- a/MdeModulePkg/Universal/Network/SnpDxe/Shutdown.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/Shutdown.c
@@ -43,7 +43,7 @@ PxeShutdown (
   //\r
   // Issue UNDI command and check result.\r
   //\r
   //\r
   // Issue UNDI command and check result.\r
   //\r

-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nsnp->undi.shutdown()  "));\r
+  DEBUG ((EFI_D_NET, "\nsnp->undi.shutdown()  "));\r

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


@@ -51,7 +51,7 @@ PxeShutdown (
     //\r
     // UNDI could not be shutdown. Return UNDI error.\r
     //\r
     //\r
     // UNDI could not be shutdown. Return UNDI error.\r
     //\r

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

 \r
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
     return EFI_DEVICE_ERROR;\r
   }\r

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Snp.c b/MdeModulePkg/Universal/Network/SnpDxe/Snp.c
index 58451608e5737f30be2cc7f719068f1233b06ae1..0006c447a6c7d922c2386a7121ab37c409883701 100644 (file)
--- a/MdeModulePkg/Universal/Network/SnpDxe/Snp.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/Snp.c
@@ -155,7 +155,7 @@ SimpleNetworkDriverSupported (
   // Check to see if !PXE structure is valid. Paragraph alignment of !PXE structure is required.\r
   //\r
   if (NiiProtocol->ID & 0x0F) {\r
   // Check to see if !PXE structure is valid. Paragraph alignment of !PXE structure is required.\r
   //\r
   if (NiiProtocol->ID & 0x0F) {\r

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

     Status = EFI_UNSUPPORTED;\r
     goto Done;\r
   }\r
     Status = EFI_UNSUPPORTED;\r
     goto Done;\r
   }\r


@@ -166,25 +166,25 @@ SimpleNetworkDriverSupported (
   //  Verify !PXE revisions.\r
   //\r
   if (Pxe->hw.Signature != PXE_ROMID_SIGNATURE) {\r
   //  Verify !PXE revisions.\r
   //\r
   if (Pxe->hw.Signature != PXE_ROMID_SIGNATURE) {\r

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

     Status = EFI_UNSUPPORTED;\r
     goto Done;\r
   }\r
 \r
   if (Pxe->hw.Rev < PXE_ROMID_REV) {\r
     Status = EFI_UNSUPPORTED;\r
     goto Done;\r
   }\r
 \r
   if (Pxe->hw.Rev < PXE_ROMID_REV) {\r

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

     Status = EFI_UNSUPPORTED;\r
     goto Done;\r
   }\r
 \r
   if (Pxe->hw.MajorVer < PXE_ROMID_MAJORVER) {\r
 \r
     Status = EFI_UNSUPPORTED;\r
     goto Done;\r
   }\r
 \r
   if (Pxe->hw.MajorVer < PXE_ROMID_MAJORVER) {\r
 \r

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

     Status = EFI_UNSUPPORTED;\r
     goto Done;\r
 \r
   } else if (Pxe->hw.MajorVer == PXE_ROMID_MAJORVER && Pxe->hw.MinorVer < PXE_ROMID_MINORVER) {\r
     Status = EFI_UNSUPPORTED;\r
     goto Done;\r
 \r
   } else if (Pxe->hw.MajorVer == PXE_ROMID_MAJORVER && Pxe->hw.MinorVer < PXE_ROMID_MINORVER) {\r

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

     Status = EFI_UNSUPPORTED;\r
     goto Done;\r
   }\r
     Status = EFI_UNSUPPORTED;\r
     goto Done;\r
   }\r


@@ -193,13 +193,13 @@ SimpleNetworkDriverSupported (
   //\r
   if ((Pxe->hw.Implementation & PXE_ROMID_IMP_HW_UNDI) == 0) {\r
     if (Pxe->sw.EntryPoint < Pxe->sw.Len) {\r
   //\r
   if ((Pxe->hw.Implementation & PXE_ROMID_IMP_HW_UNDI) == 0) {\r
     if (Pxe->sw.EntryPoint < Pxe->sw.Len) {\r

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

       Status = EFI_UNSUPPORTED;\r
       goto Done;\r
     }\r
 \r
     if (Pxe->sw.BusCnt == 0) {\r
       Status = EFI_UNSUPPORTED;\r
       goto Done;\r
     }\r
 \r
     if (Pxe->sw.BusCnt == 0) {\r

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

       Status = EFI_UNSUPPORTED;\r
       goto Done;\r
     }\r
       Status = EFI_UNSUPPORTED;\r
       goto Done;\r
     }\r


@@ -258,7 +258,7 @@ SimpleNetworkDriverStart (
   UINT8                                     BarIndex;\r
   PXE_STATFLAGS                             InitStatFlags;\r
 \r
   UINT8                                     BarIndex;\r
   PXE_STATFLAGS                             InitStatFlags;\r
 \r

-  DEBUG ((EFI_D_INFO, "\nSnpNotifyNetworkInterfaceIdentifier()  "));\r
+  DEBUG ((EFI_D_NET, "\nSnpNotifyNetworkInterfaceIdentifier()  "));\r

 \r
   Status = gBS->OpenProtocol (\r
                   Controller,\r
 \r
   Status = gBS->OpenProtocol (\r
                   Controller,\r


@@ -320,7 +320,7 @@ SimpleNetworkDriverStart (
   Pxe = (PXE_UNDI *) (UINTN) (Nii->ID);\r
 \r
   if (Calc8BitCksum (Pxe, Pxe->hw.Len) != 0) {\r
   Pxe = (PXE_UNDI *) (UINTN) (Nii->ID);\r
 \r
   if (Calc8BitCksum (Pxe, Pxe->hw.Len) != 0) {\r

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

     goto NiiError;\r
   }\r
 \r
     goto NiiError;\r
   }\r
 \r


@@ -335,7 +335,7 @@ SimpleNetworkDriverStart (
     //  broadcast support or we cannot do DHCP!\r
     //\r
   } else {\r
     //  broadcast support or we cannot do DHCP!\r
     //\r
   } else {\r

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

     goto NiiError;\r
   }\r
   //\r
     goto NiiError;\r
   }\r
   //\r


@@ -352,7 +352,7 @@ SimpleNetworkDriverStart (
                         );\r
 \r
   if (Status != EFI_SUCCESS) {\r
                         );\r
 \r
   if (Status != EFI_SUCCESS) {\r

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

     goto NiiError;\r
   }\r
 \r
     goto NiiError;\r
   }\r
 \r


@@ -426,7 +426,7 @@ SimpleNetworkDriverStart (
                         );\r
 \r
   if (Status != EFI_SUCCESS) {\r
                         );\r
 \r
   if (Status != EFI_SUCCESS) {\r

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

     goto Error_DeleteSNP;\r
   }\r
 \r
     goto Error_DeleteSNP;\r
   }\r
 \r


@@ -468,7 +468,7 @@ SimpleNetworkDriverStart (
   Snp->Cdb.IFnum      = Snp->IfNum;\r
   Snp->Cdb.Control    = PXE_CONTROL_LAST_CDB_IN_LIST;\r
 \r
   Snp->Cdb.IFnum      = Snp->IfNum;\r
   Snp->Cdb.Control    = PXE_CONTROL_LAST_CDB_IN_LIST;\r
 \r

-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nSnp->undi.get_init_info()  "));\r
+  DEBUG ((EFI_D_NET, "\nSnp->undi.get_init_info()  "));\r

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


@@ -478,7 +478,7 @@ SimpleNetworkDriverStart (
   InitStatFlags = Snp->Cdb.StatFlags;\r
 \r
   if (Snp->Cdb.StatCode != PXE_STATCODE_SUCCESS) {\r
   InitStatFlags = Snp->Cdb.StatFlags;\r
 \r
   if (Snp->Cdb.StatCode != PXE_STATCODE_SUCCESS) {\r

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

     PxeStop (Snp);\r
     goto Error_DeleteSNP;\r
   }\r
     PxeStop (Snp);\r
     goto Error_DeleteSNP;\r
   }\r


@@ -498,12 +498,12 @@ SimpleNetworkDriverStart (
   Snp->Cdb.IFnum      = Snp->IfNum;\r
   Snp->Cdb.Control    = PXE_CONTROL_LAST_CDB_IN_LIST;\r
 \r
   Snp->Cdb.IFnum      = Snp->IfNum;\r
   Snp->Cdb.Control    = PXE_CONTROL_LAST_CDB_IN_LIST;\r
 \r

-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nSnp->undi.get_config_info()  "));\r
+  DEBUG ((EFI_D_NET, "\nSnp->undi.get_config_info()  "));\r

 \r
   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);\r
 \r
   if (Snp->Cdb.StatCode != PXE_STATCODE_SUCCESS) {\r
 \r
   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);\r
 \r
   if (Snp->Cdb.StatCode != PXE_STATCODE_SUCCESS) {\r

-    DEBUG ((EFI_D_ERROR | EFI_D_NET, "\nSnp->undi.config_info()  %xh:%xh\n", Snp->Cdb.StatFlags, Snp->Cdb.StatCode));\r
+    DEBUG ((EFI_D_NET, "\nSnp->undi.config_info()  %xh:%xh\n", Snp->Cdb.StatFlags, Snp->Cdb.StatCode));\r

     PxeStop (Snp);\r
     goto Error_DeleteSNP;\r
   }\r
     PxeStop (Snp);\r
     goto Error_DeleteSNP;\r
   }\r

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Start.c b/MdeModulePkg/Universal/Network/SnpDxe/Start.c
index 5beebad27459746230588eb7904839204575a1b5..6be07339d8070097ec36b8c530fe60979b487abf 100644 (file)
--- a/MdeModulePkg/Universal/Network/SnpDxe/Start.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/Start.c
@@ -72,7 +72,7 @@ PxeStart (
   //\r
   // Issue UNDI command and check result.\r
   //\r
   //\r
   // Issue UNDI command and check result.\r
   //\r

-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nsnp->undi.start()  "));\r
+  DEBUG ((EFI_D_NET, "\nsnp->undi.start()  "));\r

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

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Station_address.c b/MdeModulePkg/Universal/Network/SnpDxe/Station_address.c
index 42792c26e148e70e1b1e3afdcc406d14961aba60..09ae9f6256825a161bd5bda81e563317373f39e3 100644 (file)
--- a/MdeModulePkg/Universal/Network/SnpDxe/Station_address.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/Station_address.c
@@ -50,7 +50,7 @@ PxeGetStnAddr (
   //\r
   // Issue UNDI command and check result.\r
   //\r
   //\r
   // Issue UNDI command and check result.\r
   //\r

-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nsnp->undi.station_addr()  "));\r
+  DEBUG ((EFI_D_NET, "\nsnp->undi.station_addr()  "));\r

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


@@ -139,7 +139,7 @@ PxeSetStnAddr (
   //\r
   // Issue UNDI command and check result.\r
   //\r
   //\r
   // Issue UNDI command and check result.\r
   //\r

-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nsnp->undi.station_addr()  "));\r
+  DEBUG ((EFI_D_NET, "\nsnp->undi.station_addr()  "));\r

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

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Statistics.c b/MdeModulePkg/Universal/Network/SnpDxe/Statistics.c
index 5261a8441ce74bec8bef737e6988837ba09ebd14..c52fc23db36c01207c8eba78b2f23ddf377a86b9 100644 (file)
--- a/MdeModulePkg/Universal/Network/SnpDxe/Statistics.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/Statistics.c
@@ -139,7 +139,7 @@ SnpUndi32Statistics (
   //\r
   // Issue UNDI command and check result.\r
   //\r
   //\r
   // Issue UNDI command and check result.\r
   //\r

-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nsnp->undi.statistics()  "));\r
+  DEBUG ((EFI_D_NET, "\nsnp->undi.statistics()  "));\r

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

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Stop.c b/MdeModulePkg/Universal/Network/SnpDxe/Stop.c
index f707ed4fa16143c250dbfd22382abb532c30d1a5..c0590e64d33f0b634688003e3e277eea54934dae 100644 (file)
--- a/MdeModulePkg/Universal/Network/SnpDxe/Stop.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/Stop.c
@@ -43,13 +43,13 @@ PxeStop (
   //\r
   // Issue UNDI command\r
   //\r
   //\r
   // Issue UNDI command\r
   //\r

-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nsnp->undi.stop()  "));\r
+  DEBUG ((EFI_D_NET, "\nsnp->undi.stop()  "));\r

 \r
   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);\r
 \r
   if (Snp->Cdb.StatCode != PXE_STATCODE_SUCCESS) {\r
     DEBUG (\r
 \r
   (*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);\r
 \r
   if (Snp->Cdb.StatCode != PXE_STATCODE_SUCCESS) {\r
     DEBUG (\r

-      (EFI_D_ERROR,\r
+      (EFI_D_WARN,\r

       "\nsnp->undi.stop()  %xh:%xh\n",\r
       Snp->Cdb.StatCode,\r
       Snp->Cdb.StatFlags)\r
       "\nsnp->undi.stop()  %xh:%xh\n",\r
       Snp->Cdb.StatCode,\r
       Snp->Cdb.StatFlags)\r

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Transmit.c b/MdeModulePkg/Universal/Network/SnpDxe/Transmit.c
index f103a59b3fb769d7ab5e0d19f3797b95b453aa31..b529012a012160ea0070d46eba25d6a6916c4315 100644 (file)
--- a/MdeModulePkg/Universal/Network/SnpDxe/Transmit.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/Transmit.c
@@ -101,7 +101,7 @@ PxeFillHeader (
   //\r
   // Issue UNDI command and check result.\r
   //\r
   //\r
   // Issue UNDI command and check result.\r
   //\r

-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nSnp->undi.fill_header()  "));\r
+  DEBUG ((EFI_D_NET, "\nSnp->undi.fill_header()  "));\r

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


@@ -177,16 +177,16 @@ PxeTransmit (
   //\r
   // Issue UNDI command and check result.\r
   //\r
   //\r
   // Issue UNDI command and check result.\r
   //\r

-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nSnp->undi.transmit()  "));\r
-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nSnp->Cdb.OpCode  == %x", Snp->Cdb.OpCode));\r
-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nSnp->Cdb.CPBaddr == %LX", Snp->Cdb.CPBaddr));\r
-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nSnp->Cdb.DBaddr  == %LX", Snp->Cdb.DBaddr));\r
-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nCpb->FrameAddr   == %LX\n", Cpb->FrameAddr));\r
+  DEBUG ((EFI_D_NET, "\nSnp->undi.transmit()  "));\r
+  DEBUG ((EFI_D_NET, "\nSnp->Cdb.OpCode  == %x", Snp->Cdb.OpCode));\r
+  DEBUG ((EFI_D_NET, "\nSnp->Cdb.CPBaddr == %LX", Snp->Cdb.CPBaddr));\r
+  DEBUG ((EFI_D_NET, "\nSnp->Cdb.DBaddr  == %LX", Snp->Cdb.DBaddr));\r
+  DEBUG ((EFI_D_NET, "\nCpb->FrameAddr   == %LX\n", Cpb->FrameAddr));\r

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

-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nexit Snp->undi.transmit()  "));\r
-  DEBUG ((EFI_D_INFO | EFI_D_NET, "\nSnp->Cdb.StatCode == %r", Snp->Cdb.StatCode));\r
+  DEBUG ((EFI_D_NET, "\nexit Snp->undi.transmit()  "));\r
+  DEBUG ((EFI_D_NET, "\nSnp->Cdb.StatCode == %r", Snp->Cdb.StatCode));\r

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