From: Liming Gao Date: Tue, 17 Sep 2019 02:58:54 +0000 (+0800) Subject: NetworkPkg: Move network related header files from MdeModulePkg to NetworkPkg X-Git-Tag: edk2-stable201911~205 X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=281161f10925ab4ee0b1d37e5883bfad9ab7c623 NetworkPkg: Move network related header files from MdeModulePkg to NetworkPkg BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2196 Cc: Siyuan Fu Cc: Jiaxin Wu Signed-off-by: Liming Gao Reviewed-by: Siyuan Fu --- diff --git a/MdeModulePkg/Include/Guid/Ip4Config2Hii.h b/MdeModulePkg/Include/Guid/Ip4Config2Hii.h deleted file mode 100644 index fe431f8c00..0000000000 --- a/MdeModulePkg/Include/Guid/Ip4Config2Hii.h +++ /dev/null @@ -1,19 +0,0 @@ -/** @file - GUIDs used as HII FormSet and HII Package list GUID in Ip4Dxe driver. - -Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.
-SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ - -#ifndef __IP4_CONFIG2_HII_GUID_H__ -#define __IP4_CONFIG2_HII_GUID_H__ - -#define IP4_CONFIG2_NVDATA_GUID \ - { \ - 0x9b942747, 0x154e, 0x4d29, { 0xa4, 0x36, 0xbf, 0x71, 0x0, 0xc8, 0xb5, 0x3b } \ - } - -extern EFI_GUID gIp4Config2NvDataGuid; - -#endif diff --git a/MdeModulePkg/Include/Guid/Ip4IScsiConfigHii.h b/MdeModulePkg/Include/Guid/Ip4IScsiConfigHii.h deleted file mode 100644 index 18d67ae601..0000000000 --- a/MdeModulePkg/Include/Guid/Ip4IScsiConfigHii.h +++ /dev/null @@ -1,25 +0,0 @@ -/** @file - GUIDs used as HII FormSet and HII Package list GUID in IP4 IScsiDxe driver. - -Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.
-SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ - -#ifndef __IP4_ISCSI_CONFIG_HII_GUID_H__ -#define __IP4_ISCSI_CONFIG_HII_GUID_H__ - -#define IP4_ISCSI_CONFIG_GUID \ - { \ - 0x6456ed61, 0x3579, 0x41c9, { 0x8a, 0x26, 0x0a, 0x0b, 0xd6, 0x2b, 0x78, 0xfc } \ - } - -#define ISCSI_CHAP_AUTH_INFO_GUID \ - { \ - 0x786ec0ac, 0x65ae, 0x4d1b, {0xb1, 0x37, 0xd, 0x11, 0xa, 0x48, 0x37, 0x97} \ - } - -extern EFI_GUID gIp4IScsiConfigGuid; -extern EFI_GUID gIScsiCHAPAuthInfoGuid; - -#endif diff --git a/MdeModulePkg/Include/Guid/VlanConfigHii.h b/MdeModulePkg/Include/Guid/VlanConfigHii.h deleted file mode 100644 index 9f74e4d592..0000000000 --- a/MdeModulePkg/Include/Guid/VlanConfigHii.h +++ /dev/null @@ -1,19 +0,0 @@ -/** @file - GUIDs used as HII FormSet and HII Package list GUID in VlanConfig driver. - -Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.
-SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ - -#ifndef __VLAN_CONFIG_HII_GUID_H__ -#define __VLAN_CONFIG_HII_GUID_H__ - -#define VLAN_CONFIG_FORM_SET_GUID \ - { \ - 0xd79df6b0, 0xef44, 0x43bd, {0x97, 0x97, 0x43, 0xe9, 0x3b, 0xcf, 0x5f, 0xa8 } \ - } - -extern EFI_GUID gVlanConfigFormSetGuid; - -#endif diff --git a/NetworkPkg/Include/Guid/Ip4Config2Hii.h b/NetworkPkg/Include/Guid/Ip4Config2Hii.h new file mode 100644 index 0000000000..fe431f8c00 --- /dev/null +++ b/NetworkPkg/Include/Guid/Ip4Config2Hii.h @@ -0,0 +1,19 @@ +/** @file + GUIDs used as HII FormSet and HII Package list GUID in Ip4Dxe driver. + +Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.
+SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#ifndef __IP4_CONFIG2_HII_GUID_H__ +#define __IP4_CONFIG2_HII_GUID_H__ + +#define IP4_CONFIG2_NVDATA_GUID \ + { \ + 0x9b942747, 0x154e, 0x4d29, { 0xa4, 0x36, 0xbf, 0x71, 0x0, 0xc8, 0xb5, 0x3b } \ + } + +extern EFI_GUID gIp4Config2NvDataGuid; + +#endif diff --git a/NetworkPkg/Include/Guid/Ip4IScsiConfigHii.h b/NetworkPkg/Include/Guid/Ip4IScsiConfigHii.h new file mode 100644 index 0000000000..18d67ae601 --- /dev/null +++ b/NetworkPkg/Include/Guid/Ip4IScsiConfigHii.h @@ -0,0 +1,25 @@ +/** @file + GUIDs used as HII FormSet and HII Package list GUID in IP4 IScsiDxe driver. + +Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.
+SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#ifndef __IP4_ISCSI_CONFIG_HII_GUID_H__ +#define __IP4_ISCSI_CONFIG_HII_GUID_H__ + +#define IP4_ISCSI_CONFIG_GUID \ + { \ + 0x6456ed61, 0x3579, 0x41c9, { 0x8a, 0x26, 0x0a, 0x0b, 0xd6, 0x2b, 0x78, 0xfc } \ + } + +#define ISCSI_CHAP_AUTH_INFO_GUID \ + { \ + 0x786ec0ac, 0x65ae, 0x4d1b, {0xb1, 0x37, 0xd, 0x11, 0xa, 0x48, 0x37, 0x97} \ + } + +extern EFI_GUID gIp4IScsiConfigGuid; +extern EFI_GUID gIScsiCHAPAuthInfoGuid; + +#endif diff --git a/NetworkPkg/Include/Guid/VlanConfigHii.h b/NetworkPkg/Include/Guid/VlanConfigHii.h new file mode 100644 index 0000000000..9f74e4d592 --- /dev/null +++ b/NetworkPkg/Include/Guid/VlanConfigHii.h @@ -0,0 +1,19 @@ +/** @file + GUIDs used as HII FormSet and HII Package list GUID in VlanConfig driver. + +Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.
+SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#ifndef __VLAN_CONFIG_HII_GUID_H__ +#define __VLAN_CONFIG_HII_GUID_H__ + +#define VLAN_CONFIG_FORM_SET_GUID \ + { \ + 0xd79df6b0, 0xef44, 0x43bd, {0x97, 0x97, 0x43, 0xe9, 0x3b, 0xcf, 0x5f, 0xa8 } \ + } + +extern EFI_GUID gVlanConfigFormSetGuid; + +#endif diff --git a/NetworkPkg/NetworkPkg.dec b/NetworkPkg/NetworkPkg.dec index 2bdb3f5663..c39e7d692e 100644 --- a/NetworkPkg/NetworkPkg.dec +++ b/NetworkPkg/NetworkPkg.dec @@ -70,6 +70,16 @@ # Include/Guid/WifiConnectionManagerConfigHii.h gWifiConfigGuid = { 0x9f94d327, 0x0b18, 0x4245, { 0x8f, 0xf2, 0x83, 0x2e, 0x30, 0xd, 0x2c, 0xef }} + ## Include/Guid/Ip4Config2Hii.h + gIp4Config2NvDataGuid = { 0x9b942747, 0x154e, 0x4d29, { 0xa4, 0x36, 0xbf, 0x71, 0x0, 0xc8, 0xb5, 0x3b }} + + ## Include/Guid/VlanConfigHii.h + gVlanConfigFormSetGuid = { 0xd79df6b0, 0xef44, 0x43bd, { 0x97, 0x97, 0x43, 0xe9, 0x3b, 0xcf, 0x5f, 0xa8 }} + + ## Include/Guid/Ip4IScsiConfigHii.h + gIp4IScsiConfigGuid = { 0x6456ed61, 0x3579, 0x41c9, { 0x8a, 0x26, 0x0a, 0x0b, 0xd6, 0x2b, 0x78, 0xfc }} + gIScsiCHAPAuthInfoGuid = { 0x786ec0ac, 0x65ae, 0x4d1b, { 0xb1, 0x37, 0xd, 0x11, 0xa, 0x48, 0x37, 0x97 }} + [Protocols] ## Include/Protocol/Dpc.h gEfiDpcProtocolGuid = {0x480f8ae9, 0xc46, 0x4aa9, { 0xbc, 0x89, 0xdb, 0x9f, 0xba, 0x61, 0x98, 0x6 }}