1. Removed #ifdef SNP_DEBUG and used debug lib to output information

[mirror_edk2.git] / EdkModulePkg / Universal / Network / PxeDhcp4 / Dxe / PxeDhcp4InitSelect.c

diff --git a/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/PxeDhcp4InitSelect.c b/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/PxeDhcp4InitSelect.c
index 8b7cd288107dc6da2ab681a399eb5c1165106760..1b500c57b3dcdd46c477fc248b74a95ee5462ec7 100644 (file)
--- a/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/PxeDhcp4InitSelect.c
+++ b/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/PxeDhcp4InitSelect.c
@@ -1,17 +1,17 @@
 /*++\r
 \r
-Copyright (c) 2006, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+Copyright (c) 2006 - 2007, Intel Corporation\r
+All rights reserved. This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 Module Name:\r
   PxeDhcp4InitSelect.c\r
-  \r
+\r
 Abstract:\r
 \r
 --*/\r
@@ -19,11 +19,6 @@ Abstract:
 \r
 #include "PxeDhcp4.h"\r
 \r
-#define DebugPrint(x)\r
-//\r
-// #define DebugPrint(x) Aprint x\r
-//\r
-/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
 STATIC\r
 INTN\r
 offer_verify (\r
@@ -332,13 +327,6 @@ PxeDhcp4Init (
     return EFI_NOT_READY;\r
   }\r
 \r
-#if 0\r
-  if (!is_good_discover (&This->Data->Discover)) {\r
-    //\r
-    // %%TBD - check discover packet fields\r
-    //\r
-  }\r
-#endif\r
   //\r
   // Get pointer to our instance data.\r
   //\r
@@ -407,7 +395,7 @@ PxeDhcp4Init (
     Private->offer_list = NULL;\r
     Private->callback   = NULL;\r
 \r
-    DebugPrint (("%a:%d:%r\n", __FILE__, __LINE__, EfiStatus));\r
+    DEBUG ((EFI_D_ERROR, "%r\n", EfiStatus));\r
     return EfiStatus;\r
   }\r
 \r
@@ -477,13 +465,6 @@ PxeDhcp4Select (
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
-#if 0\r
-  if (!is_good_discover (&This->Data->Discover)) {\r
-    //\r
-    // %%TBD - check discover packet fields\r
-    //\r
-  }\r
-#endif\r
   //\r
   // Setup useful variables...\r
   //\r
@@ -701,7 +682,7 @@ PxeDhcp4Select (
   EfiStatus = add_opt (&request, srvid);\r
 \r
   if (EFI_ERROR (EfiStatus)) {\r
-    DebugPrint (("%a:%d:%r\n", __FILE__, __LINE__, EfiStatus));\r
+    DEBUG ((EFI_D_ERROR, "%r\n", EfiStatus));\r
     Private->callback = NULL;\r
     return EfiStatus;\r
   }\r
@@ -716,7 +697,7 @@ PxeDhcp4Select (
   EfiStatus = add_opt (&request, op);\r
 \r
   if (EFI_ERROR (EfiStatus)) {\r
-    DebugPrint (("%a:%d:%r\n", __FILE__, __LINE__, EfiStatus));\r
+    DEBUG ((EFI_D_ERROR, "%r\n", EfiStatus));\r
     Private->callback = NULL;\r
     return EfiStatus;\r
   }\r
@@ -738,7 +719,7 @@ PxeDhcp4Select (
                 );\r
 \r
   if (EFI_ERROR (EfiStatus)) {\r
-    DebugPrint (("%a:%d:%r\n", __FILE__, __LINE__, EfiStatus));\r
+    DEBUG ((EFI_D_ERROR, "%r\n", EfiStatus));\r
     Private->callback = NULL;\r
     return EfiStatus;\r
   }\r