Revision: 17917
http://sourceforge.net/p/edk2/code/17917
Author: jiaxinwu
Date: 2015-07-10 05:49:48 +0000 (Fri, 10 Jul 2015)
Log Message:
-----------
MdeModulePkg: Remove Ip4ConfigDxe and related guid definition
Ip4ConfigDxe driver is deprecated in UEFI 2.5, so we will not support original
Ip4Config Protocol,
which is replace by Ip4Config2 Protocol integrated in Ip4Dxe driver(git commit
1f6729ff (SVN r17853)).
Dependent network drivers, libraries and applications have been migrated to (or
extended to) the new protocol version.
For example:
git 7c25b7ea (SVN r17869): ping & ifconfig
git 00a6ad1b (SVN r17870): UefiHandleParsingLib
git 6c5c70d6 (SVN r17873): DxeNetLib
git 39561686 (SVN r17874): IpSecDxe
git c581e503 (SVN r17875): EfiSocketLib
This patch is based on related packages(MdeModulePkg, Nt32Pkg, ArmPlatformPkg,
ArmVirtPkg, EmulatorPkg, OvmfPkg, Vlv2TbltDevicePkg) clean-up work finished.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jiaxin Wu <[email protected]>
Reviewed-by: Laszlo Ersek <[email protected]>
Revision Links:
--------------
http://sourceforge.net/p/edk2/code/17853
http://sourceforge.net/p/edk2/code/17869
http://sourceforge.net/p/edk2/code/17870
http://sourceforge.net/p/edk2/code/17873
http://sourceforge.net/p/edk2/code/17874
http://sourceforge.net/p/edk2/code/17875
Modified Paths:
--------------
trunk/edk2/MdeModulePkg/MdeModulePkg.dec
trunk/edk2/MdeModulePkg/MdeModulePkg.dsc
Removed Paths:
-------------
trunk/edk2/MdeModulePkg/Include/Guid/Ip4ConfigHii.h
trunk/edk2/MdeModulePkg/Include/Guid/NicIp4ConfigNvData.h
trunk/edk2/MdeModulePkg/Universal/Network/Ip4ConfigDxe/
Deleted: trunk/edk2/MdeModulePkg/Include/Guid/Ip4ConfigHii.h
===================================================================
--- trunk/edk2/MdeModulePkg/Include/Guid/Ip4ConfigHii.h 2015-07-10 05:48:19 UTC
(rev 17916)
+++ trunk/edk2/MdeModulePkg/Include/Guid/Ip4ConfigHii.h 2015-07-10 05:49:48 UTC
(rev 17917)
@@ -1,25 +0,0 @@
-/** @file
- GUIDs used as HII FormSet and HII Package list GUID in Ip4ConfigDxe driver.
-
-Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available
under
-the terms and conditions of the BSD License that 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.
-
-**/
-
-#ifndef __IP4_CONFIG_HII_GUID_H__
-#define __IP4_CONFIG_HII_GUID_H__
-
-#define EFI_NIC_IP4_CONFIG_NVDATA_GUID \
- { \
- 0x9d5b53f, 0xf4b0, 0x4f59, { 0xa0, 0xb1, 0x7b, 0x57, 0xd3, 0x5c, 0xe, 0x5
} \
- }
-
-extern EFI_GUID gNicIp4ConfigNvDataGuid;
-
-#endif
Deleted: trunk/edk2/MdeModulePkg/Include/Guid/NicIp4ConfigNvData.h
===================================================================
--- trunk/edk2/MdeModulePkg/Include/Guid/NicIp4ConfigNvData.h 2015-07-10
05:48:19 UTC (rev 17916)
+++ trunk/edk2/MdeModulePkg/Include/Guid/NicIp4ConfigNvData.h 2015-07-10
05:49:48 UTC (rev 17917)
@@ -1,70 +0,0 @@
-/** @file
- This file defines NIC_IP4_CONFIG_INFO structure.
-
-Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available
under
-the terms and conditions of the BSD License that 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.
-
-**/
-
-#ifndef __NIC_IP4_CONFIG_NVDATA_H__
-#define __NIC_IP4_CONFIG_NVDATA_H__
-
-#include <Protocol/Ip4Config.h>
-
-#define EFI_NIC_IP4_CONFIG_VARIABLE_GUID \
- { \
- 0xd8944553, 0xc4dd, 0x41f4, { 0x9b, 0x30, 0xe1, 0x39, 0x7c, 0xfb, 0x26,
0x7b } \
- }
-
-#define EFI_NIC_IP4_CONFIG_VARIABLE L"EfiNicIp4ConfigVariable"
-
-
-//
-// Config source: dhcp or static
-//
-#define IP4_CONFIG_SOURCE_DHCP 0
-#define IP4_CONFIG_SOURCE_STATIC 1
-#define IP4_CONFIG_SOURCE_MAX 2
-
-#define IP4_NIC_NAME_LENGTH 64
-#define MAX_IP4_CONFIG_IN_VARIABLE 16
-
-//
-// The following structures are used by drivers/applications other
-// than EFI_IP4_PROTOCOL, such as the ifconfig shell application, to
-// communicate the IP configuration information to the EFI_IP4_CONFIG_PROTOCOL.
-// The EFI_IP4_PROTOCOL uses the EFI_IP4_CONFIG_PROTOCOL to get
-// the default IP4 configuration.
-//
-
-///
-/// NIC_ADDR contains the interface's type and MAC address to identify
-/// a specific NIC.
-///
-typedef struct {
- UINT16 Type; ///< Interface type.
- UINT8 Len; ///< Length of MAC address.
- EFI_MAC_ADDRESS MacAddr; ///< MAC address of interface.
-} NIC_ADDR;
-
-///
-/// NIC_IP4_CONFIG_INFO contains the IP4 configure
-/// parameters for that NIC. NIC_IP4_CONFIG_INFO is
-/// of variable length.
-///
-typedef struct {
- NIC_ADDR NicAddr; ///< Link layer address to identify
the NIC.
- UINT32 Source; ///< Static or DHCP.
- BOOLEAN Permanent; ///< Survive the reboot or not.
- EFI_IP4_IPCONFIG_DATA Ip4Info; ///< IP addresses.
-} NIC_IP4_CONFIG_INFO;
-
-extern EFI_GUID gEfiNicIp4ConfigVariableGuid;
-
-#endif
Modified: trunk/edk2/MdeModulePkg/MdeModulePkg.dec
===================================================================
--- trunk/edk2/MdeModulePkg/MdeModulePkg.dec 2015-07-10 05:48:19 UTC (rev
17916)
+++ trunk/edk2/MdeModulePkg/MdeModulePkg.dec 2015-07-10 05:49:48 UTC (rev
17917)
@@ -198,9 +198,6 @@
# Include/Guid/Crc32GuidedSectionExtraction.h
gEfiCrc32GuidedSectionExtractionGuid = { 0xFC1BCDB0, 0x7D31, 0x49aa, {0x93,
0x6A, 0xA4, 0x60, 0x0D, 0x9D, 0xD0, 0x83 } }
- ## Include/Guid/NicIp4ConfigNvData.h
- gEfiNicIp4ConfigVariableGuid = {0xd8944553, 0xc4dd, 0x41f4, { 0x9b, 0x30,
0xe1, 0x39, 0x7c, 0xfb, 0x26, 0x7b }}
-
## Include/Guid/StatusCodeCallbackGuid.h
gStatusCodeCallbackGuid = {0xe701458c, 0x4900, 0x4ca5, {0xb7, 0x72, 0x3d,
0x37, 0x94, 0x9f, 0x79, 0x27}}
@@ -264,9 +261,6 @@
## Include/Guid/PlatDriOverrideHii.h
gPlatformOverridesManagerGuid = { 0x8614567d, 0x35be, 0x4415, { 0x8d,
0x88, 0xbd, 0x7d, 0xc, 0x9c, 0x70, 0xc0 }}
- ## Include/Guid/Ip4ConfigHii.h
- gNicIp4ConfigNvDataGuid = { 0x9d5b53f, 0xf4b0, 0x4f59, { 0xa0,
0xb1, 0x7b, 0x57, 0xd3, 0x5c, 0xe, 0x5 }}
-
## Include/Guid/Ip4Config2Hii.h
gIp4Config2NvDataGuid = { 0x9b942747, 0x154e, 0x4d29, { 0xa4,
0x36, 0xbf, 0x71, 0x0, 0xc8, 0xb5, 0x3b }}
Modified: trunk/edk2/MdeModulePkg/MdeModulePkg.dsc
===================================================================
--- trunk/edk2/MdeModulePkg/MdeModulePkg.dsc 2015-07-10 05:48:19 UTC (rev
17916)
+++ trunk/edk2/MdeModulePkg/MdeModulePkg.dsc 2015-07-10 05:49:48 UTC (rev
17917)
@@ -307,7 +307,6 @@
MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
- MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf
MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
------------------------------------------------------------------------------
Don't Limit Your Business. Reach for the Cloud.
GigeNET's Cloud Solutions provide you with the tools and support that
you need to offload your IT needs and focus on growing your business.
Configured For All Businesses. Start Your Cloud Today.
https://www.gigenetcloud.com/
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
