[edk2-devel] [Patch 2/3] NetworkPkg: Move Network library header file from MdeModulePkg to NetworkPkg

Liming Gao liming.gao at intel.com
Wed May 15 12:02:19 UTC 2019


Signed-off-by: Liming Gao <liming.gao at intel.com>
Cc: Siyuan Fu <siyuan.fu at intel.com>
Cc: Jiaxin Wu <jiaxin.wu at intel.com>
---
 NetworkPkg/Application/VConfig/VConfig.inf         |  1 +
 NetworkPkg/ArpDxe/ArpDxe.inf                       |  1 +
 NetworkPkg/Dhcp4Dxe/Dhcp4Dxe.inf                   |  1 +
 NetworkPkg/DnsDxe/DnsDxe.inf                       |  1 +
 NetworkPkg/DpcDxe/DpcDxe.inf                       |  1 +
 NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf   |  1 +
 .../Include/Library/DpcLib.h                       |  0
 .../Include/Library/HttpLib.h                      |  0
 .../Include/Library/IpIoLib.h                      |  0
 .../Include/Library/NetLib.h                       |  0
 .../Include/Library/TcpIoLib.h                     |  0
 .../Include/Library/UdpIoLib.h                     |  0
 NetworkPkg/Ip4Dxe/Ip4Dxe.inf                       |  1 +
 NetworkPkg/Library/DxeDpcLib/DxeDpcLib.inf         |  1 +
 NetworkPkg/Library/DxeHttpLib/DxeHttpLib.inf       |  1 +
 NetworkPkg/Library/DxeIpIoLib/DxeIpIoLib.inf       |  1 +
 NetworkPkg/Library/DxeNetLib/DxeNetLib.inf         |  1 +
 NetworkPkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf     |  1 +
 NetworkPkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf     |  1 +
 NetworkPkg/MnpDxe/MnpDxe.inf                       |  1 +
 NetworkPkg/Mtftp4Dxe/Mtftp4Dxe.inf                 |  1 +
 NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf                 |  1 +
 NetworkPkg/NetworkPkg.dec                          | 24 ++++++++++++++++++++++
 NetworkPkg/SnpDxe/SnpDxe.inf                       |  1 +
 NetworkPkg/TcpDxe/TcpDxe.inf                       |  1 +
 NetworkPkg/TlsDxe/TlsDxe.inf                       |  1 +
 NetworkPkg/Udp4Dxe/Udp4Dxe.inf                     |  1 +
 NetworkPkg/Udp6Dxe/Udp6Dxe.inf                     |  1 +
 NetworkPkg/VlanConfigDxe/VlanConfigDxe.inf         |  1 +
 29 files changed, 46 insertions(+)
 rename {MdeModulePkg => NetworkPkg}/Include/Library/DpcLib.h (100%)
 rename {MdeModulePkg => NetworkPkg}/Include/Library/HttpLib.h (100%)
 rename {MdeModulePkg => NetworkPkg}/Include/Library/IpIoLib.h (100%)
 rename {MdeModulePkg => NetworkPkg}/Include/Library/NetLib.h (100%)
 rename {MdeModulePkg => NetworkPkg}/Include/Library/TcpIoLib.h (100%)
 rename {MdeModulePkg => NetworkPkg}/Include/Library/UdpIoLib.h (100%)

diff --git a/NetworkPkg/Application/VConfig/VConfig.inf b/NetworkPkg/Application/VConfig/VConfig.inf
index 2e6cd1aef3..1d7a81201e 100644
--- a/NetworkPkg/Application/VConfig/VConfig.inf
+++ b/NetworkPkg/Application/VConfig/VConfig.inf
@@ -35,6 +35,7 @@ [Sources]
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
+  NetworkPkg/NetworkPkg.dec
   ShellPkg/ShellPkg.dec
 
 [LibraryClasses]
diff --git a/NetworkPkg/ArpDxe/ArpDxe.inf b/NetworkPkg/ArpDxe/ArpDxe.inf
index 78344edf90..2ff74895a6 100644
--- a/NetworkPkg/ArpDxe/ArpDxe.inf
+++ b/NetworkPkg/ArpDxe/ArpDxe.inf
@@ -42,6 +42,7 @@ [Sources]
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
+  NetworkPkg/NetworkPkg.dec
 
 
 [LibraryClasses]
diff --git a/NetworkPkg/Dhcp4Dxe/Dhcp4Dxe.inf b/NetworkPkg/Dhcp4Dxe/Dhcp4Dxe.inf
index 62883518b2..e34aab0a6b 100644
--- a/NetworkPkg/Dhcp4Dxe/Dhcp4Dxe.inf
+++ b/NetworkPkg/Dhcp4Dxe/Dhcp4Dxe.inf
@@ -44,6 +44,7 @@ [Sources]
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
+  NetworkPkg/NetworkPkg.dec
 
 
 [LibraryClasses]
diff --git a/NetworkPkg/DnsDxe/DnsDxe.inf b/NetworkPkg/DnsDxe/DnsDxe.inf
index 6298aadc8c..3a66bdd13a 100644
--- a/NetworkPkg/DnsDxe/DnsDxe.inf
+++ b/NetworkPkg/DnsDxe/DnsDxe.inf
@@ -21,6 +21,7 @@ [Defines]
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
+  NetworkPkg/NetworkPkg.dec
 
 [Sources]
   ComponentName.c
diff --git a/NetworkPkg/DpcDxe/DpcDxe.inf b/NetworkPkg/DpcDxe/DpcDxe.inf
index 8c241d7f46..1462de28a2 100644
--- a/NetworkPkg/DpcDxe/DpcDxe.inf
+++ b/NetworkPkg/DpcDxe/DpcDxe.inf
@@ -29,6 +29,7 @@ [Sources]
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
+  NetworkPkg/NetworkPkg.dec
 
 [LibraryClasses]
   UefiDriverEntryPoint
diff --git a/NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf b/NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
index fe08d542b8..e12c3cc922 100644
--- a/NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
+++ b/NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
@@ -22,6 +22,7 @@ [Defines]
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
+  NetworkPkg/NetworkPkg.dec
 
 [Sources]
   HttpUtilitiesDxe.h
diff --git a/MdeModulePkg/Include/Library/DpcLib.h b/NetworkPkg/Include/Library/DpcLib.h
similarity index 100%
rename from MdeModulePkg/Include/Library/DpcLib.h
rename to NetworkPkg/Include/Library/DpcLib.h
diff --git a/MdeModulePkg/Include/Library/HttpLib.h b/NetworkPkg/Include/Library/HttpLib.h
similarity index 100%
rename from MdeModulePkg/Include/Library/HttpLib.h
rename to NetworkPkg/Include/Library/HttpLib.h
diff --git a/MdeModulePkg/Include/Library/IpIoLib.h b/NetworkPkg/Include/Library/IpIoLib.h
similarity index 100%
rename from MdeModulePkg/Include/Library/IpIoLib.h
rename to NetworkPkg/Include/Library/IpIoLib.h
diff --git a/MdeModulePkg/Include/Library/NetLib.h b/NetworkPkg/Include/Library/NetLib.h
similarity index 100%
rename from MdeModulePkg/Include/Library/NetLib.h
rename to NetworkPkg/Include/Library/NetLib.h
diff --git a/MdeModulePkg/Include/Library/TcpIoLib.h b/NetworkPkg/Include/Library/TcpIoLib.h
similarity index 100%
rename from MdeModulePkg/Include/Library/TcpIoLib.h
rename to NetworkPkg/Include/Library/TcpIoLib.h
diff --git a/MdeModulePkg/Include/Library/UdpIoLib.h b/NetworkPkg/Include/Library/UdpIoLib.h
similarity index 100%
rename from MdeModulePkg/Include/Library/UdpIoLib.h
rename to NetworkPkg/Include/Library/UdpIoLib.h
diff --git a/NetworkPkg/Ip4Dxe/Ip4Dxe.inf b/NetworkPkg/Ip4Dxe/Ip4Dxe.inf
index ff9f32174e..852932f3c3 100644
--- a/NetworkPkg/Ip4Dxe/Ip4Dxe.inf
+++ b/NetworkPkg/Ip4Dxe/Ip4Dxe.inf
@@ -66,6 +66,7 @@ [Sources]
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
+  NetworkPkg/NetworkPkg.dec
 
 [LibraryClasses]
   UefiLib
diff --git a/NetworkPkg/Library/DxeDpcLib/DxeDpcLib.inf b/NetworkPkg/Library/DxeDpcLib/DxeDpcLib.inf
index 1c23729ce3..3fb8718f1e 100644
--- a/NetworkPkg/Library/DxeDpcLib/DxeDpcLib.inf
+++ b/NetworkPkg/Library/DxeDpcLib/DxeDpcLib.inf
@@ -28,6 +28,7 @@ [Sources]
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
+  NetworkPkg/NetworkPkg.dec
 
 [LibraryClasses]
   DebugLib
diff --git a/NetworkPkg/Library/DxeHttpLib/DxeHttpLib.inf b/NetworkPkg/Library/DxeHttpLib/DxeHttpLib.inf
index c613dc1718..984a24ffd3 100644
--- a/NetworkPkg/Library/DxeHttpLib/DxeHttpLib.inf
+++ b/NetworkPkg/Library/DxeHttpLib/DxeHttpLib.inf
@@ -30,6 +30,7 @@ [Sources]
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
+  NetworkPkg/NetworkPkg.dec
 
 [LibraryClasses]
   BaseLib
diff --git a/NetworkPkg/Library/DxeIpIoLib/DxeIpIoLib.inf b/NetworkPkg/Library/DxeIpIoLib/DxeIpIoLib.inf
index a789d80de6..bfd631a31d 100644
--- a/NetworkPkg/Library/DxeIpIoLib/DxeIpIoLib.inf
+++ b/NetworkPkg/Library/DxeIpIoLib/DxeIpIoLib.inf
@@ -28,6 +28,7 @@ [Sources]
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
+  NetworkPkg/NetworkPkg.dec
 
 
 [LibraryClasses]
diff --git a/NetworkPkg/Library/DxeNetLib/DxeNetLib.inf b/NetworkPkg/Library/DxeNetLib/DxeNetLib.inf
index 35a8247517..40e855695b 100644
--- a/NetworkPkg/Library/DxeNetLib/DxeNetLib.inf
+++ b/NetworkPkg/Library/DxeNetLib/DxeNetLib.inf
@@ -31,6 +31,7 @@ [Sources]
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
+  NetworkPkg/NetworkPkg.dec
 
 
 [LibraryClasses]
diff --git a/NetworkPkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf b/NetworkPkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
index 66873d7837..4dcf34429a 100644
--- a/NetworkPkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
+++ b/NetworkPkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
@@ -28,6 +28,7 @@ [Sources]
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
+  NetworkPkg/NetworkPkg.dec
 
 
 [LibraryClasses]
diff --git a/NetworkPkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf b/NetworkPkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
index 483c2cda02..7614faa959 100644
--- a/NetworkPkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
+++ b/NetworkPkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
@@ -28,6 +28,7 @@ [Sources]
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
+  NetworkPkg/NetworkPkg.dec
 
 
 [LibraryClasses]
diff --git a/NetworkPkg/MnpDxe/MnpDxe.inf b/NetworkPkg/MnpDxe/MnpDxe.inf
index d4685b3e6a..e399232415 100644
--- a/NetworkPkg/MnpDxe/MnpDxe.inf
+++ b/NetworkPkg/MnpDxe/MnpDxe.inf
@@ -44,6 +44,7 @@ [Sources]
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
+  NetworkPkg/NetworkPkg.dec
 
 [LibraryClasses]
   BaseLib
diff --git a/NetworkPkg/Mtftp4Dxe/Mtftp4Dxe.inf b/NetworkPkg/Mtftp4Dxe/Mtftp4Dxe.inf
index 6e5335ca23..25cbdc185d 100644
--- a/NetworkPkg/Mtftp4Dxe/Mtftp4Dxe.inf
+++ b/NetworkPkg/Mtftp4Dxe/Mtftp4Dxe.inf
@@ -46,6 +46,7 @@ [Sources]
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
+  NetworkPkg/NetworkPkg.dec
 
 
 [LibraryClasses]
diff --git a/NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf b/NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
index 827b6e7706..7a1af34f94 100644
--- a/NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
+++ b/NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
@@ -47,6 +47,7 @@ [Sources]
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
+  NetworkPkg/NetworkPkg.dec
 
 
 [LibraryClasses]
diff --git a/NetworkPkg/NetworkPkg.dec b/NetworkPkg/NetworkPkg.dec
index 25964539ed..b260ea5b77 100644
--- a/NetworkPkg/NetworkPkg.dec
+++ b/NetworkPkg/NetworkPkg.dec
@@ -20,6 +20,30 @@ [Defines]
 [Includes]
   Include
 
+[LibraryClasses]
+  ##  @libraryclass  IpIo layer upon EFI IP4 Protocol.
+  #   This library is only intended to be used by UEFI network stack modules.
+  IpIoLib|Include/Library/IpIoLib.h
+
+  ##  @libraryclass  Basic function for UEFI network stack.
+  #   This library is only intended to be used by UEFI network stack modules.
+  NetLib|Include/Library/NetLib.h
+
+  ##  @libraryclass  The helper routines to access UDP service.
+  #   This library is only intended to be used by UEFI network stack modules.
+  UdpIoLib|Include/Library/UdpIoLib.h
+
+  ##  @libraryclass  The helper routines to access TCP service.
+  #   This library is only intended to be used by UEFI network stack modules.
+  TcpIoLib|Include/Library/TcpIoLib.h
+
+  ##  @libraryclass  The helper routines to access HTTP service.
+  #   This library is only intended to be used by UEFI network stack modules.
+  HttpLib|Include/Library/HttpLib.h
+
+  ##  @libraryclass  Library for Deferred Procedure Calls.
+  DpcLib|Include/Library/DpcLib.h
+
 [Guids]
   ## Network package token space guid.
   # Include/Guid/NetworkPkgTokenSpace.h
diff --git a/NetworkPkg/SnpDxe/SnpDxe.inf b/NetworkPkg/SnpDxe/SnpDxe.inf
index eab97d2e9e..9a37b12e53 100644
--- a/NetworkPkg/SnpDxe/SnpDxe.inf
+++ b/NetworkPkg/SnpDxe/SnpDxe.inf
@@ -53,6 +53,7 @@ [Sources]
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
+  NetworkPkg/NetworkPkg.dec
 
 
 [LibraryClasses]
diff --git a/NetworkPkg/TcpDxe/TcpDxe.inf b/NetworkPkg/TcpDxe/TcpDxe.inf
index 7b6f9ecd67..4865acb0d7 100644
--- a/NetworkPkg/TcpDxe/TcpDxe.inf
+++ b/NetworkPkg/TcpDxe/TcpDxe.inf
@@ -52,6 +52,7 @@ [Sources]
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
+  NetworkPkg/NetworkPkg.dec
 
 
 [LibraryClasses]
diff --git a/NetworkPkg/TlsDxe/TlsDxe.inf b/NetworkPkg/TlsDxe/TlsDxe.inf
index 9d642a66c2..f640461809 100644
--- a/NetworkPkg/TlsDxe/TlsDxe.inf
+++ b/NetworkPkg/TlsDxe/TlsDxe.inf
@@ -29,6 +29,7 @@ [Defines]
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
+  NetworkPkg/NetworkPkg.dec
   CryptoPkg/CryptoPkg.dec
 
 [Sources]
diff --git a/NetworkPkg/Udp4Dxe/Udp4Dxe.inf b/NetworkPkg/Udp4Dxe/Udp4Dxe.inf
index ba623a6637..6a71ed7019 100644
--- a/NetworkPkg/Udp4Dxe/Udp4Dxe.inf
+++ b/NetworkPkg/Udp4Dxe/Udp4Dxe.inf
@@ -41,6 +41,7 @@ [Sources]
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
+  NetworkPkg/NetworkPkg.dec
 
 
 [LibraryClasses]
diff --git a/NetworkPkg/Udp6Dxe/Udp6Dxe.inf b/NetworkPkg/Udp6Dxe/Udp6Dxe.inf
index c3d4031645..7830d2de26 100644
--- a/NetworkPkg/Udp6Dxe/Udp6Dxe.inf
+++ b/NetworkPkg/Udp6Dxe/Udp6Dxe.inf
@@ -38,6 +38,7 @@ [Sources]
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
+  NetworkPkg/NetworkPkg.dec
 
 [LibraryClasses]
   BaseLib
diff --git a/NetworkPkg/VlanConfigDxe/VlanConfigDxe.inf b/NetworkPkg/VlanConfigDxe/VlanConfigDxe.inf
index 72af88d695..700cd881fd 100644
--- a/NetworkPkg/VlanConfigDxe/VlanConfigDxe.inf
+++ b/NetworkPkg/VlanConfigDxe/VlanConfigDxe.inf
@@ -36,6 +36,7 @@ [Sources]
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
+  NetworkPkg/NetworkPkg.dec
 
 [LibraryClasses]
   BaseLib
-- 
2.13.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40688): https://edk2.groups.io/g/devel/message/40688
Mute This Topic: https://groups.io/mt/31628787/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-




More information about the edk2-devel-archive mailing list