From 3aaddf9276ccf00b4b6349dfce058e3ae287dd3a Mon Sep 17 00:00:00 2001 From: vanjeff Date: Tue, 20 Mar 2007 02:44:09 +0000 Subject: 1. Removed #ifdef SNP_DEBUG and used debug lib to output information 2. Rename PcdPlatformNoCsmSupport to PcdPlatformCsmSupport. 3 Removed #ifdef EFI_NO_CSM and used PcdPlatformCsmSupport. 4. Removed #ifdef ALIGNMENT from C Variable.c and added 2 files Variable/Pei/Ipf/VariableWorker.c and Variable/Pei/VariableWorker.c git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2487 6f19259b-4bc3-4df7-8a09-765794883524 --- EdkModulePkg/Universal/Network/Snp32_64/Dxe/Snp.h | 34 ++----- .../Universal/Network/Snp32_64/Dxe/callback.c | 18 ++-- EdkModulePkg/Universal/Network/Snp32_64/Dxe/snp.c | 102 ++++++--------------- 3 files changed, 43 insertions(+), 111 deletions(-) (limited to 'EdkModulePkg/Universal/Network/Snp32_64/Dxe') diff --git a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/Snp.h b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/Snp.h index 31cbc8eb83..038c2e66b0 100644 --- a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/Snp.h +++ b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/Snp.h @@ -1,12 +1,12 @@ /*++ -Copyright (c) 2006, Intel Corporation -All rights reserved. This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +Copyright (c) 2006, Intel Corporation +All rights reserved. This program and the accompanying materials +are licensed and made available under the terms and conditions of the BSD License +which accompanies this distribution. The full text of the license may be found at +http://opensource.org/licenses/bsd-license.php + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. Module name: snp.h @@ -22,17 +22,8 @@ Revision history: #include "IndustryStandard/pci22.h" -#define SNP_DEBUG 0 #define FOUR_GIGABYTES (UINT64) 0x100000000ULL -#if SNP_DEBUG -#undef D_NET -#define D_NET D_WARN -#define SNP_PRINT(DebugInfo) Print (DebugInfo) -#else -#define SNP_PRINT(DebugInfo) -#endif - #define SNP_DRIVER_SIGNATURE EFI_SIGNATURE_32 ('s', 'n', 'd', 's') #define MAX_MAP_LENGTH 100 @@ -455,13 +446,4 @@ VOID #define SNP_MEM_PAGES(x) (((x) - 1) / 4096 + 1) -#if SNP_DEBUG -extern -VOID -snp_wait_for_key ( - VOID - ) -; -#endif - #endif /* _SNP_H */ diff --git a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/callback.c b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/callback.c index 2a9c953f89..16e40c609b 100644 --- a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/callback.c +++ b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/callback.c @@ -1,12 +1,12 @@ /*++ -Copyright (c) 2006, Intel Corporation -All rights reserved. This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +Copyright (c) 2006, Intel Corporation +All rights reserved. This program and the accompanying materials +are licensed and made available under the terms and conditions of the BSD License +which accompanies this distribution. The full text of the license may be found at +http://opensource.org/licenses/bsd-license.php + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. Module name: callback.c @@ -482,7 +482,7 @@ Returns: } if (Index >= MAX_MAP_LENGTH) { - SNP_PRINT (L"SNP maplist is FULL\n"); + DEBUG ((EFI_D_INFO, "SNP maplist is FULL\n")); *DevAddrPtr = 0; return ; } diff --git a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/snp.c b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/snp.c index 7146e462c7..4b6cda9b1e 100644 --- a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/snp.c +++ b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/snp.c @@ -1,12 +1,12 @@ /*++ -Copyright (c) 2006, Intel Corporation -All rights reserved. This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +Copyright (c) 2006, Intel Corporation +All rights reserved. This program and the accompanying materials +are licensed and made available under the terms and conditions of the BSD License +which accompanies this distribution. The full text of the license may be found at +http://opensource.org/licenses/bsd-license.php + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. Module name: snp.c @@ -41,10 +41,8 @@ Returns: --*/ { -#if SNP_DEBUG - Aprint ("\nissue_hwundi_command() - This should not be called!"); - snp_wait_for_key (); -#endif + DEBUG ((EFI_D_ERROR, "\nissue_hwundi_command() - This should not be called!")); + if (cdb == 0) { return EFI_INVALID_PARAMETER; @@ -65,7 +63,7 @@ calc_8bit_cksum ( Routine Description: Compute 8-bit checksum of a buffer. - + Arguments: ptr - Pointer to buffer. len - Length of buffer in bytes. @@ -147,19 +145,13 @@ SimpleNetworkDriverSupported ( ); if (Status == EFI_ALREADY_STARTED) { -#if SNP_DEBUG - Aprint ("Support(): Already Started. on handle %x\n", Controller); -#endif + DEBUG ((EFI_D_INFO, "Support(): Already Started. on handle %x\n", Controller)); return EFI_ALREADY_STARTED; } if (!EFI_ERROR (Status)) { - -#if SNP_DEBUG - Aprint ("Support(): UNDI3.1 found on handle %x\n", Controller); - snp_wait_for_key (); -#endif + DEBUG ((EFI_D_INFO, "Support(): UNDI3.1 found on handle %x\n", Controller)); IsUndi31 = TRUE; } else { // @@ -177,10 +169,7 @@ SimpleNetworkDriverSupported ( return Status; } -#if SNP_DEBUG - Aprint ("Support(): UNDI3.0 found on handle %x\n", Controller); - snp_wait_for_key (); -#endif + DEBUG ((EFI_D_INFO, "Support(): UNDI3.0 found on handle %x\n", Controller)); } // // check the version, we don't want to connect to the undi16 @@ -244,10 +233,7 @@ SimpleNetworkDriverSupported ( } Status = EFI_SUCCESS; -#if SNP_DEBUG - Aprint ("Support(): supported on %x\n", Controller); - snp_wait_for_key (); -#endif + DEBUG ((EFI_D_INFO, "Support(): supported on %x\n", Controller)); Done: if (IsUndi31) { @@ -374,10 +360,8 @@ Arguments: // probably not a 3.1 UNDI // UndiNew = TRUE; -#if SNP_DEBUG - Aprint ("Start(): UNDI3.1 found\n"); - snp_wait_for_key (); -#endif + DEBUG ((EFI_D_INFO, "Start(): UNDI3.1 found\n")); + } else { UndiNew = FALSE; Status = gBS->OpenProtocol ( @@ -399,10 +383,7 @@ Arguments: return Status; } -#if SNP_DEBUG - Aprint ("Start(): UNDI3.0 found\n"); - snp_wait_for_key (); -#endif + DEBUG ((EFI_D_INFO, "Start(): UNDI3.0 found\n")); } pxe = (PXE_UNDI *) (UINTN) (Nii->ID); @@ -996,7 +977,7 @@ Returns: Controller ); } - + Status = gBS->CloseProtocol ( Controller, &gEfiDevicePathProtocolGuid, @@ -1077,7 +1058,7 @@ add_v2p ( Routine Description: This routine maps the given CPU address to a Device address. It creates a - an entry in the map list with the virtual and physical addresses and the + an entry in the map list with the virtual and physical addresses and the un map cookie. Arguments: @@ -1138,7 +1119,7 @@ find_v2p ( /*++ Routine Description: - This routine searches the linked list of mapped address nodes (for undi3.0 + This routine searches the linked list of mapped address nodes (for undi3.0 interface) to find the node that corresponds to the given virtual address and returns a pointer to that node. @@ -1176,9 +1157,9 @@ del_v2p ( /*++ Routine Description: - This routine unmaps the given virtual address and frees the memory allocated + This routine unmaps the given virtual address and frees the memory allocated for the map list node corresponding to that address. - + Arguments: vaddr - virtual address (or CPU address) to be unmapped @@ -1210,11 +1191,9 @@ Returns: gBS->FreePool (v); -#if SNP_DEBUG if (Status) { - Print (L"Unmap failed with status = %x\n", Status); + DEBUG ((EFI_D_ERROR, "Unmap failed with status = %x\n", Status)); } -#endif return Status; } @@ -1223,42 +1202,13 @@ Returns: v->next = t->next; Status = mPciIoFncs->Unmap (mPciIoFncs, t->unmap); gBS->FreePool (t); -#if SNP_DEBUG + if (Status) { - Print (L"Unmap failed with status = %x\n", Status); + DEBUG ((EFI_D_ERROR, "Unmap failed with status = %x\n", Status)); } -#endif return Status; } } return EFI_NOT_FOUND; } - -#if SNP_DEBUG -VOID -snp_wait_for_key ( - VOID - ) -/*++ - -Routine Description: - Wait for a key stroke, used for debugging purposes - -Arguments: - none - -Returns: - none - ---*/ -{ - EFI_INPUT_KEY key; - - Aprint ("\nPress any key to continue\n"); - - while (gST->ConIn->ReadKeyStroke (gST->ConIn, &key) == EFI_NOT_READY) { - ; - } -} -#endif -- cgit v1.2.3