From e4b99ad97997066491cbd7c00c2237160016079a Mon Sep 17 00:00:00 2001 From: lgao4 Date: Tue, 24 Feb 2009 08:26:40 +0000 Subject: [PATCH] Change library class PlatDriOverLib to PlatformDriOverrideLib Move Application Platform Override Manager into Application directory. Add comments in Network library class to say they are only intended to be used by UEFI network stack modules. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7641 6f19259b-4bc3-4df7-8a09-765794883524 --- .../PlatOverMngr/PlatOverMngr.c | 2 +- .../PlatOverMngr/PlatOverMngr.h | 0 .../PlatOverMngr/PlatOverMngr.inf | 4 +-- .../PlatOverMngr/Vfr.vfr | 0 .../PlatOverMngr/VfrStrings.uni | Bin MdeModulePkg/Include/Library/IpIoLib.h | 3 ++- MdeModulePkg/Include/Library/NetLib.h | 3 ++- ...iOverLib.h => PlatformDriverOverrideLib.h} | 10 ++++---- MdeModulePkg/Include/Library/UdpIoLib.h | 24 ++++++++++++++++-- .../DxePlatDriOverLib/DxePlatDriOverLib.inf | 2 +- .../Library/DxePlatDriOverLib/PlatDriOver.h | 2 +- .../Library/DxeUdpIoLib/DxeUdpIoLib.c | 1 + MdeModulePkg/MdeModulePkg.dec | 2 +- MdeModulePkg/MdeModulePkg.dsc | 4 +-- .../PlatformDriOverride.c | 4 +-- .../PlatformDriOverrideDxe.inf | 4 +-- 16 files changed, 44 insertions(+), 21 deletions(-) rename MdeModulePkg/{Universal/PlatformDriverOverride => Application}/PlatOverMngr/PlatOverMngr.c (96%) rename MdeModulePkg/{Universal/PlatformDriverOverride => Application}/PlatOverMngr/PlatOverMngr.h (100%) rename MdeModulePkg/{Universal/PlatformDriverOverride => Application}/PlatOverMngr/PlatOverMngr.inf (95%) rename MdeModulePkg/{Universal/PlatformDriverOverride => Application}/PlatOverMngr/Vfr.vfr (100%) rename MdeModulePkg/{Universal/PlatformDriverOverride => Application}/PlatOverMngr/VfrStrings.uni (100%) rename MdeModulePkg/Include/Library/{PlatDriOverLib.h => PlatformDriverOverrideLib.h} (94%) diff --git a/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.c b/MdeModulePkg/Application/PlatOverMngr/PlatOverMngr.c similarity index 96% rename from MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.c rename to MdeModulePkg/Application/PlatOverMngr/PlatOverMngr.c index b7f790c937..3711a9193e 100644 --- a/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.c +++ b/MdeModulePkg/Application/PlatOverMngr/PlatOverMngr.c @@ -43,7 +43,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include #include -#include +#include #include #include #include diff --git a/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.h b/MdeModulePkg/Application/PlatOverMngr/PlatOverMngr.h similarity index 100% rename from MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.h rename to MdeModulePkg/Application/PlatOverMngr/PlatOverMngr.h diff --git a/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.inf b/MdeModulePkg/Application/PlatOverMngr/PlatOverMngr.inf similarity index 95% rename from MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.inf rename to MdeModulePkg/Application/PlatOverMngr/PlatOverMngr.inf index 7ba07bcb60..e8e3487b3e 100644 --- a/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.inf +++ b/MdeModulePkg/Application/PlatOverMngr/PlatOverMngr.inf @@ -12,7 +12,7 @@ # 4. The UI application save all the mapping info in NV variables for the following boot, # which will be consumed by platform override protocol driver to publish the platform override protocol. # -# Copyright (c) 2007 - 2008, Intel Corporation. All rights reserved. +# Copyright (c) 2007 - 2009, Intel Corporation. All rights reserved. # # All rights reserved. This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -55,7 +55,7 @@ UefiLib UefiApplicationEntryPoint UefiBootServicesTableLib - PlatDriOverLib + PlatformDriverOverrideLib HiiLib IfrSupportLib ExtendedHiiLib diff --git a/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/Vfr.vfr b/MdeModulePkg/Application/PlatOverMngr/Vfr.vfr similarity index 100% rename from MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/Vfr.vfr rename to MdeModulePkg/Application/PlatOverMngr/Vfr.vfr diff --git a/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/VfrStrings.uni b/MdeModulePkg/Application/PlatOverMngr/VfrStrings.uni similarity index 100% rename from MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/VfrStrings.uni rename to MdeModulePkg/Application/PlatOverMngr/VfrStrings.uni diff --git a/MdeModulePkg/Include/Library/IpIoLib.h b/MdeModulePkg/Include/Library/IpIoLib.h index 4f40074ae5..a4fbcfd1a3 100644 --- a/MdeModulePkg/Include/Library/IpIoLib.h +++ b/MdeModulePkg/Include/Library/IpIoLib.h @@ -1,5 +1,6 @@ /** @file - This library provides IpIo layer upon EFI IP4 Protocol. + Ihis library is only intended to be used by UEFI network stack modules. + It provides IpIo layer upon EFI IP4 Protocol. Copyright (c) 2005 - 2008, Intel Corporation.
All rights reserved. This program and the accompanying materials diff --git a/MdeModulePkg/Include/Library/NetLib.h b/MdeModulePkg/Include/Library/NetLib.h index 7a33546870..5045e8dcb0 100644 --- a/MdeModulePkg/Include/Library/NetLib.h +++ b/MdeModulePkg/Include/Library/NetLib.h @@ -1,5 +1,6 @@ /** @file - This library provides basic function for UEFI network stack. + Ihis library is only intended to be used by UEFI network stack modules. + It provides basic function for UEFI network stack. Copyright (c) 2005 - 2008, Intel Corporation All rights reserved. This program and the accompanying materials diff --git a/MdeModulePkg/Include/Library/PlatDriOverLib.h b/MdeModulePkg/Include/Library/PlatformDriverOverrideLib.h similarity index 94% rename from MdeModulePkg/Include/Library/PlatDriOverLib.h rename to MdeModulePkg/Include/Library/PlatformDriverOverrideLib.h index ee42f8ba79..2af25d53d5 100644 --- a/MdeModulePkg/Include/Library/PlatDriOverLib.h +++ b/MdeModulePkg/Include/Library/PlatformDriverOverrideLib.h @@ -1,8 +1,8 @@ /** @file + Ihis library is only intended to be used by Platform Driver Override Dxe Driver and Application. + It provides basic platform driver override functions. - This library provides basic platform driver override functions. - -Copyright (c) 2007 - 2008, Intel Corporation +Copyright (c) 2007 - 2009, 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 @@ -13,8 +13,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ -#ifndef _PLAT_DRI_OVER_LIB_H_ -#define _PLAT_DRI_OVER_LIB_H_ +#ifndef _PLATFORM_DRIVER_OVERRIDE_LIB_H_ +#define _PLATFORM_DRIVER_OVERRIDE_LIB_H_ #include diff --git a/MdeModulePkg/Include/Library/UdpIoLib.h b/MdeModulePkg/Include/Library/UdpIoLib.h index f8ffa444ed..820b8f2b1b 100644 --- a/MdeModulePkg/Include/Library/UdpIoLib.h +++ b/MdeModulePkg/Include/Library/UdpIoLib.h @@ -1,6 +1,6 @@ /** @file - The helper routines to access UDP service. It is used by both - DHCP and MTFTP. + Ihis library is only intended to be used by UEFI network stack modules. + It provides the helper routines to access UDP service. It is used by both DHCP and MTFTP. Copyright (c) 2006 - 2008, Intel Corporation.
All rights reserved. This program and the accompanying materials @@ -169,6 +169,26 @@ BOOLEAN IN VOID *Context ); +/** + Cancel all the sent datagram that pass the selection criteria of ToCancel. + If ToCancel is NULL, all the datagrams are cancelled. + + @param[in] UdpIo The UDP_IO_PORT to cancel packet. + @param[in] IoStatus The IoStatus to return to the packet owners. + @param[in] ToCancel The select funtion to test whether to cancel this + packet or not. + @param[in] Context The opaque parameter to the ToCancel. + +**/ +VOID +EFIAPI +UdpIoCancelDgrams ( + IN UDP_IO_PORT *UdpIo, + IN EFI_STATUS IoStatus, + IN UDP_IO_TO_CANCEL ToCancel, OPTIONAL + IN VOID *Context + ); + /** Create a UDP_IO_PORT to access the UDP service. It will create and configure a UDP child. diff --git a/MdeModulePkg/Library/DxePlatDriOverLib/DxePlatDriOverLib.inf b/MdeModulePkg/Library/DxePlatDriOverLib/DxePlatDriOverLib.inf index 34d05bfc5e..8514bc2bf0 100644 --- a/MdeModulePkg/Library/DxePlatDriOverLib/DxePlatDriOverLib.inf +++ b/MdeModulePkg/Library/DxePlatDriOverLib/DxePlatDriOverLib.inf @@ -24,7 +24,7 @@ FILE_GUID = 8bd8d711-2736-46d7-8c81-5de68e0a9e88 MODULE_TYPE = DXE_DRIVER VERSION_STRING = 1.0 - LIBRARY_CLASS = PlatDriOverLib|DXE_DRIVER UEFI_DRIVER UEFI_APPLICATION + LIBRARY_CLASS = PlatformDriverOverrideLib|DXE_DRIVER UEFI_DRIVER UEFI_APPLICATION # # The following information is for reference only and not required by the build tools. diff --git a/MdeModulePkg/Library/DxePlatDriOverLib/PlatDriOver.h b/MdeModulePkg/Library/DxePlatDriOverLib/PlatDriOver.h index 3d9fb2d724..99b7dfcad2 100644 --- a/MdeModulePkg/Library/DxePlatDriOverLib/PlatDriOver.h +++ b/MdeModulePkg/Library/DxePlatDriOverLib/PlatDriOver.h @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include diff --git a/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c b/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c index 151a67aff6..3e95393221 100644 --- a/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c +++ b/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c @@ -482,6 +482,7 @@ FREE_MEM: **/ VOID +EFIAPI UdpIoCancelDgrams ( IN UDP_IO_PORT *UdpIo, IN EFI_STATUS IoStatus, diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec index c8fde3abdc..33aecd3b43 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec @@ -48,7 +48,7 @@ RecoveryLib|Include/Library/RecoveryLib.h ## @libraryclass Basic platform driver override functions. - PlatDriOverLib|Include/Library/PlatDriOverLib.h + PlatformDriverOverrideLib|Include/Library/PlatformDriverOverrideLib.h ## @libraryclass Provides HII related functions. HiiLib|Include/Library/HiiLib.h diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc index c824ef35f2..7c69fa25e4 100644 --- a/MdeModulePkg/MdeModulePkg.dsc +++ b/MdeModulePkg/MdeModulePkg.dsc @@ -76,7 +76,7 @@ PlatformBdsLib|MdeModulePkg/Library/PlatformBdsLibNull/PlatformBdsLibNull.inf DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf PlatformBdsLib|MdeModulePkg/Library/PlatformBdsLibNull/PlatformBdsLibNull.inf - PlatDriOverLib|MdeModulePkg/Library/DxePlatDriOverLib/DxePlatDriOverLib.inf + PlatformDriverOverrideLib|MdeModulePkg/Library/DxePlatDriOverLib/DxePlatDriOverLib.inf OemHookStatusCodeLib|IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf GenericBdsLib|IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf @@ -339,7 +339,7 @@ MdeModulePkg/Universal/PCD/Dxe/Pcd.inf MdeModulePkg/Universal/PCD/Pei/Pcd.inf MdeModulePkg/Universal/PlatformDriverOverride/PlatformDriOverrideDxe/PlatformDriOverrideDxe.inf - MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.inf + MdeModulePkg/Application/PlatOverMngr/PlatOverMngr.inf MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/Variable/Application/VariableInfo.inf diff --git a/MdeModulePkg/Universal/PlatformDriverOverride/PlatformDriOverrideDxe/PlatformDriOverride.c b/MdeModulePkg/Universal/PlatformDriverOverride/PlatformDriOverrideDxe/PlatformDriOverride.c index d6a7170344..64e9a4d64d 100644 --- a/MdeModulePkg/Universal/PlatformDriverOverride/PlatformDriOverrideDxe/PlatformDriOverride.c +++ b/MdeModulePkg/Universal/PlatformDriverOverride/PlatformDriOverrideDxe/PlatformDriOverride.c @@ -1,6 +1,6 @@ /** @file -Copyright (c) 2007 - 2008, Intel Corporation +Copyright (c) 2007 - 2009, 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 @@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include #include -#include +#include #include LIST_ENTRY mMappingDataBase = INITIALIZE_LIST_HEAD_VARIABLE (mMappingDataBase); diff --git a/MdeModulePkg/Universal/PlatformDriverOverride/PlatformDriOverrideDxe/PlatformDriOverrideDxe.inf b/MdeModulePkg/Universal/PlatformDriverOverride/PlatformDriOverrideDxe/PlatformDriOverrideDxe.inf index 90ee5133e2..855fb82a59 100644 --- a/MdeModulePkg/Universal/PlatformDriverOverride/PlatformDriOverrideDxe/PlatformDriOverrideDxe.inf +++ b/MdeModulePkg/Universal/PlatformDriverOverride/PlatformDriOverrideDxe/PlatformDriOverrideDxe.inf @@ -4,7 +4,7 @@ # It only implements one interface GetDriver of PLATFORM_DRIVER_OVERRIDE_PROTOCOL protocol # and doesn't support other two interfaces GetDriverPath, DriverLoaded. # -# Copyright (c) 2007 - 2008, Intel Corporation. All rights reserved. +# Copyright (c) 2007 - 2009, Intel Corporation. All rights reserved. # # All rights reserved. This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -41,7 +41,7 @@ BaseLib UefiDriverEntryPoint DebugLib - PlatDriOverLib + PlatformDriverOverrideLib UefiBootServicesTableLib [Protocols]