NetworkPkg: Move network related header files from MdeModulePkg to NetworkPkg

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2196

Cc: Siyuan Fu <siyuan.fu@intel.com>
Cc: Jiaxin Wu <jiaxin.wu@intel.com>
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Siyuan Fu <siyuan.fu@intel.com>

diff --git a/MdeModulePkg/Include/Guid/Ip4Config2Hii.h b/MdeModulePkg/Include/Guid/Ip4Config2Hii.h
deleted file mode 100644 (file)
index fe431f8..0000000
--- a/MdeModulePkg/Include/Guid/Ip4Config2Hii.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/** @file\r
-  GUIDs used as HII FormSet and HII Package list GUID in Ip4Dxe driver.\r
-\r
-Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r
-SPDX-License-Identifier: BSD-2-Clause-Patent\r
-\r
-**/\r
-\r
-#ifndef __IP4_CONFIG2_HII_GUID_H__\r
-#define __IP4_CONFIG2_HII_GUID_H__\r
-\r
-#define IP4_CONFIG2_NVDATA_GUID \\r
-  { \\r
-    0x9b942747, 0x154e, 0x4d29, { 0xa4, 0x36, 0xbf, 0x71, 0x0, 0xc8, 0xb5, 0x3b } \\r
-  }\r
-\r
-extern EFI_GUID gIp4Config2NvDataGuid;\r
-\r
-#endif\r

diff --git a/MdeModulePkg/Include/Guid/Ip4IScsiConfigHii.h b/MdeModulePkg/Include/Guid/Ip4IScsiConfigHii.h
deleted file mode 100644 (file)
index 18d67ae..0000000
--- a/MdeModulePkg/Include/Guid/Ip4IScsiConfigHii.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/** @file\r
-  GUIDs used as HII FormSet and HII Package list GUID in IP4 IScsiDxe driver.\r
-\r
-Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
-SPDX-License-Identifier: BSD-2-Clause-Patent\r
-\r
-**/\r
-\r
-#ifndef __IP4_ISCSI_CONFIG_HII_GUID_H__\r
-#define __IP4_ISCSI_CONFIG_HII_GUID_H__\r
-\r
-#define IP4_ISCSI_CONFIG_GUID \\r
-  { \\r
-    0x6456ed61, 0x3579, 0x41c9, { 0x8a, 0x26, 0x0a, 0x0b, 0xd6, 0x2b, 0x78, 0xfc } \\r
-  }\r
-\r
-#define ISCSI_CHAP_AUTH_INFO_GUID \\r
-  { \\r
-    0x786ec0ac, 0x65ae, 0x4d1b, {0xb1, 0x37, 0xd, 0x11, 0xa, 0x48, 0x37, 0x97} \\r
-  }\r
-\r
-extern EFI_GUID gIp4IScsiConfigGuid;\r
-extern EFI_GUID gIScsiCHAPAuthInfoGuid;\r
-\r
-#endif\r

diff --git a/MdeModulePkg/Include/Guid/VlanConfigHii.h b/MdeModulePkg/Include/Guid/VlanConfigHii.h
deleted file mode 100644 (file)
index 9f74e4d..0000000
--- a/MdeModulePkg/Include/Guid/VlanConfigHii.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/** @file\r
-  GUIDs used as HII FormSet and HII Package list GUID in VlanConfig driver.\r
-\r
-Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
-SPDX-License-Identifier: BSD-2-Clause-Patent\r
-\r
-**/\r
-\r
-#ifndef __VLAN_CONFIG_HII_GUID_H__\r
-#define __VLAN_CONFIG_HII_GUID_H__\r
-\r
-#define VLAN_CONFIG_FORM_SET_GUID \\r
-  { \\r
-    0xd79df6b0, 0xef44, 0x43bd, {0x97, 0x97, 0x43, 0xe9, 0x3b, 0xcf, 0x5f, 0xa8 } \\r
-  }\r
-\r
-extern EFI_GUID gVlanConfigFormSetGuid;\r
-\r
-#endif\r

diff --git a/NetworkPkg/Include/Guid/Ip4Config2Hii.h b/NetworkPkg/Include/Guid/Ip4Config2Hii.h
new file mode 100644 (file)
index 0000000..fe431f8
--- /dev/null
+++ b/NetworkPkg/Include/Guid/Ip4Config2Hii.h
@@ -0,0 +1,19 @@
+/** @file\r
+  GUIDs used as HII FormSet and HII Package list GUID in Ip4Dxe driver.\r
+\r
+Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r
+\r
+**/\r
+\r
+#ifndef __IP4_CONFIG2_HII_GUID_H__\r
+#define __IP4_CONFIG2_HII_GUID_H__\r
+\r
+#define IP4_CONFIG2_NVDATA_GUID \\r
+  { \\r
+    0x9b942747, 0x154e, 0x4d29, { 0xa4, 0x36, 0xbf, 0x71, 0x0, 0xc8, 0xb5, 0x3b } \\r
+  }\r
+\r
+extern EFI_GUID gIp4Config2NvDataGuid;\r
+\r
+#endif\r

diff --git a/NetworkPkg/Include/Guid/Ip4IScsiConfigHii.h b/NetworkPkg/Include/Guid/Ip4IScsiConfigHii.h
new file mode 100644 (file)
index 0000000..18d67ae
--- /dev/null
+++ b/NetworkPkg/Include/Guid/Ip4IScsiConfigHii.h
@@ -0,0 +1,25 @@
+/** @file\r
+  GUIDs used as HII FormSet and HII Package list GUID in IP4 IScsiDxe driver.\r
+\r
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r
+\r
+**/\r
+\r
+#ifndef __IP4_ISCSI_CONFIG_HII_GUID_H__\r
+#define __IP4_ISCSI_CONFIG_HII_GUID_H__\r
+\r
+#define IP4_ISCSI_CONFIG_GUID \\r
+  { \\r
+    0x6456ed61, 0x3579, 0x41c9, { 0x8a, 0x26, 0x0a, 0x0b, 0xd6, 0x2b, 0x78, 0xfc } \\r
+  }\r
+\r
+#define ISCSI_CHAP_AUTH_INFO_GUID \\r
+  { \\r
+    0x786ec0ac, 0x65ae, 0x4d1b, {0xb1, 0x37, 0xd, 0x11, 0xa, 0x48, 0x37, 0x97} \\r
+  }\r
+\r
+extern EFI_GUID gIp4IScsiConfigGuid;\r
+extern EFI_GUID gIScsiCHAPAuthInfoGuid;\r
+\r
+#endif\r

diff --git a/NetworkPkg/Include/Guid/VlanConfigHii.h b/NetworkPkg/Include/Guid/VlanConfigHii.h
new file mode 100644 (file)
index 0000000..9f74e4d
--- /dev/null
+++ b/NetworkPkg/Include/Guid/VlanConfigHii.h
@@ -0,0 +1,19 @@
+/** @file\r
+  GUIDs used as HII FormSet and HII Package list GUID in VlanConfig driver.\r
+\r
+Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r
+\r
+**/\r
+\r
+#ifndef __VLAN_CONFIG_HII_GUID_H__\r
+#define __VLAN_CONFIG_HII_GUID_H__\r
+\r
+#define VLAN_CONFIG_FORM_SET_GUID \\r
+  { \\r
+    0xd79df6b0, 0xef44, 0x43bd, {0x97, 0x97, 0x43, 0xe9, 0x3b, 0xcf, 0x5f, 0xa8 } \\r
+  }\r
+\r
+extern EFI_GUID gVlanConfigFormSetGuid;\r
+\r
+#endif\r

diff --git a/NetworkPkg/NetworkPkg.dec b/NetworkPkg/NetworkPkg.dec
index 2bdb3f5663a265cae0b3697cf6f49ef87b426a34..c39e7d692ed8c85c7090277cc1d84484c3bc4963 100644 (file)
--- a/NetworkPkg/NetworkPkg.dec
+++ b/NetworkPkg/NetworkPkg.dec
@@ -70,6 +70,16 @@
   # Include/Guid/WifiConnectionManagerConfigHii.h\r
   gWifiConfigGuid               = { 0x9f94d327, 0x0b18, 0x4245, { 0x8f, 0xf2, 0x83, 0x2e, 0x30, 0xd, 0x2c, 0xef }}\r
 \r
+  ## Include/Guid/Ip4Config2Hii.h\r
+  gIp4Config2NvDataGuid              = { 0x9b942747, 0x154e, 0x4d29, { 0xa4, 0x36, 0xbf, 0x71, 0x0, 0xc8, 0xb5, 0x3b }}\r
+\r
+  ## Include/Guid/VlanConfigHii.h\r
+  gVlanConfigFormSetGuid             = { 0xd79df6b0, 0xef44, 0x43bd, { 0x97, 0x97, 0x43, 0xe9, 0x3b, 0xcf, 0x5f, 0xa8 }}\r
+\r
+  ## Include/Guid/Ip4IScsiConfigHii.h\r
+  gIp4IScsiConfigGuid                = { 0x6456ed61, 0x3579, 0x41c9, { 0x8a, 0x26, 0x0a, 0x0b, 0xd6, 0x2b, 0x78, 0xfc }}\r
+  gIScsiCHAPAuthInfoGuid             = { 0x786ec0ac, 0x65ae, 0x4d1b, { 0xb1, 0x37, 0xd, 0x11, 0xa, 0x48, 0x37, 0x97 }}\r
+\r
 [Protocols]\r
   ## Include/Protocol/Dpc.h\r
   gEfiDpcProtocolGuid           = {0x480f8ae9, 0xc46, 0x4aa9,  { 0xbc, 0x89, 0xdb, 0x9f, 0xba, 0x61, 0x98, 0x6 }}\r