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

[mirror_edk2.git] / EdkModulePkg / Universal / Network / Snp32_64 / Dxe / callback.c

diff --git a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/callback.c b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/callback.c
index 65a4d580d4b4d396754789ce23507693b574645d..16e40c609b486fe8830cabbae893c0e2249a20f8 100644 (file)
--- a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/callback.c
+++ b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/callback.c
@@ -1,12 +1,12 @@
 /*++\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, 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
  callback.c\r
@@ -33,7 +33,6 @@ STATIC EFI_LOCK             mLock;
 //\r
 // End Global variables\r
 //\r
-extern EFI_PCI_IO_PROTOCOL  *mPciIoFncs;\r
 \r
 VOID\r
 snp_undi32_callback_v2p_30 (\r
@@ -182,19 +181,19 @@ Returns:
 \r
   switch (NumBytes) {\r
   case 2:\r
-    Width = 1;\r
+    Width = (EFI_PCI_IO_PROTOCOL_WIDTH) 1;\r
     break;\r
 \r
   case 4:\r
-    Width = 2;\r
+    Width = (EFI_PCI_IO_PROTOCOL_WIDTH) 2;\r
     break;\r
 \r
   case 8:\r
-    Width = 3;\r
+    Width = (EFI_PCI_IO_PROTOCOL_WIDTH) 3;\r
     break;\r
 \r
   default:\r
-    Width = 0;\r
+    Width = (EFI_PCI_IO_PROTOCOL_WIDTH) 0;\r
   }\r
 \r
   switch (ReadOrWrite) {\r
@@ -344,18 +343,18 @@ Returns:
 \r
   snp   = (SNP_DRIVER *) (UINTN) UniqueId;\r
 \r
-  Width = 0;\r
+  Width = (EFI_PCI_IO_PROTOCOL_WIDTH) 0;\r
   switch (NumBytes) {\r
   case 2:\r
-    Width = 1;\r
+    Width = (EFI_PCI_IO_PROTOCOL_WIDTH) 1;\r
     break;\r
 \r
   case 4:\r
-    Width = 2;\r
+    Width = (EFI_PCI_IO_PROTOCOL_WIDTH) 2;\r
     break;\r
 \r
   case 8:\r
-    Width = 3;\r
+    Width = (EFI_PCI_IO_PROTOCOL_WIDTH) 3;\r
     break;\r
   }\r
 \r
@@ -483,7 +482,7 @@ Returns:
   }\r
 \r
   if (Index >= MAX_MAP_LENGTH) {\r
-    SNP_PRINT (L"SNP maplist is FULL\n");\r
+    DEBUG ((EFI_D_INFO, "SNP maplist is FULL\n"));\r
     *DevAddrPtr = 0;\r
     return ;\r
   }\r