summaryrefslogtreecommitdiff
path: root/MdeModulePkg/Universal
diff options
context:
space:
mode:
authorqhuang8 <qhuang8@6f19259b-4bc3-4df7-8a09-765794883524>2007-09-28 06:02:01 +0000
committerqhuang8 <qhuang8@6f19259b-4bc3-4df7-8a09-765794883524>2007-09-28 06:02:01 +0000
commitda1d02010d73465a9c2b21f619e8c01cb00bd1fa (patch)
tree926eb3e0419e731712c9aafb78b2f8b0e742f901 /MdeModulePkg/Universal
parentba7e162ec1407988cfe305b15499e9b2fd9c51ef (diff)
downloadedk2-platforms-da1d02010d73465a9c2b21f619e8c01cb00bd1fa.tar.xz
Clear up network stack to use R9 MdeLib:
1.Use driver model APIs in UefiLib 2.Register Unload Image in INF/MSA to be included in autogen code. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3962 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdeModulePkg/Universal')
-rw-r--r--MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.c2
-rw-r--r--MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf2
-rw-r--r--MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.msa1
-rw-r--r--MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c2
-rw-r--r--MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf2
-rw-r--r--MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.msa1
-rw-r--r--MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c5
-rw-r--r--MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf2
-rw-r--r--MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.msa1
-rw-r--r--MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c2
-rw-r--r--MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf1
-rw-r--r--MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.msa1
-rw-r--r--MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c18
-rw-r--r--MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf2
-rw-r--r--MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.msa1
-rw-r--r--MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c2
-rw-r--r--MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf2
-rw-r--r--MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.msa1
-rw-r--r--MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c4
-rw-r--r--MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf2
-rw-r--r--MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.msa1
-rw-r--r--MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c2
-rw-r--r--MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf2
-rw-r--r--MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.msa1
24 files changed, 34 insertions, 26 deletions
diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.c b/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.c
index 6a52ed1958..924028531a 100644
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.c
+++ b/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.c
@@ -749,7 +749,7 @@ Returns:
--*/
{
- return NetLibInstallAllDriverProtocols (
+ return EfiLibInstallAllDriverProtocols (
ImageHandle,
SystemTable,
&gArpDriverBinding,
diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf b/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
index 5a50e93d0f..ef954fe61e 100644
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
+++ b/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
@@ -24,7 +24,7 @@
EFI_SPECIFICATION_VERSION = 0x00020000
ENTRY_POINT = ArpDriverEntryPoint
-
+ UNLOAD_IMAGE = NetLibDefaultUnload
#
# The following information is for reference only and not required by the build tools.
#
diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.msa b/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.msa
index 12f19d6535..47286726c8 100644
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.msa
+++ b/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.msa
@@ -67,6 +67,7 @@
<Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
<Extern>
<ModuleEntryPoint>ArpDriverEntryPoint</ModuleEntryPoint>
+ <ModuleUnloadImage>NetLibDefaultUnload</ModuleUnloadImage>
</Extern>
</Externs>
</ModuleSurfaceArea> \ No newline at end of file
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c
index b9f2704c00..d14697262c 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c
@@ -61,7 +61,7 @@ Returns:
--*/
{
- return NetLibInstallAllDriverProtocols (
+ return EfiLibInstallAllDriverProtocols (
ImageHandle,
SystemTable,
&gDhcp4DriverBinding,
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
index 2c35be1f0e..906bf839a7 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
@@ -24,7 +24,7 @@
EFI_SPECIFICATION_VERSION = 0x00020000
ENTRY_POINT = Dhcp4DriverEntryPoint
-
+ UNLOAD_IMAGE = NetLibDefaultUnload
#
# The following information is for reference only and not required by the build tools.
#
diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.msa b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.msa
index 343850add0..2dac8b41d9 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.msa
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.msa
@@ -72,6 +72,7 @@
<Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
<Extern>
<ModuleEntryPoint>Dhcp4DriverEntryPoint</ModuleEntryPoint>
+ <ModuleUnloadImage>NetLibDefaultUnload</ModuleUnloadImage>
</Extern>
</Externs>
</ModuleSurfaceArea> \ No newline at end of file
diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c
index dd103bc908..c3845f4734 100644
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c
@@ -85,15 +85,14 @@ Returns:
--*/
{
- return NetLibInstallAllDriverProtocolsWithUnload (
+ return EfiLibInstallAllDriverProtocols (
ImageHandle,
SystemTable,
&gIp4ConfigDriverBinding,
ImageHandle,
&gIp4ConfigComponentName,
NULL,
- NULL,
- EfiIp4ConfigUnload
+ NULL
);
}
diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf
index 4f9e583e4a..613649cdda 100644
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf
@@ -25,7 +25,7 @@
EFI_SPECIFICATION_VERSION = 0x00020000
ENTRY_POINT = Ip4ConfigDriverEntryPoint
-
+ UNLOAD_IMAGE = EfiIp4ConfigUnload
#
# The following information is for reference only and not required by the build tools.
#
diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.msa b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.msa
index 4a2ccc0c0b..644ee42e3d 100644
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.msa
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.msa
@@ -72,6 +72,7 @@
<Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
<Extern>
<ModuleEntryPoint>Ip4ConfigDriverEntryPoint</ModuleEntryPoint>
+ <ModuleUnloadImage>EfiIp4ConfigUnload</ModuleUnloadImage>
</Extern>
</Externs>
</ModuleSurfaceArea> \ No newline at end of file
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c
index cc9bbf6964..f8d4b39276 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c
@@ -56,7 +56,7 @@ Returns:
--*/
{
- return NetLibInstallAllDriverProtocols (
+ return EfiLibInstallAllDriverProtocols (
ImageHandle,
SystemTable,
&gIp4DriverBinding,
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
index f45cc3f609..58addbcda3 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
@@ -24,6 +24,7 @@
EFI_SPECIFICATION_VERSION = 0x00020000
ENTRY_POINT = Ip4DriverEntryPoint
+ UNLOAD_IMAGE = NetLibDefaultUnload
#
# The following information is for reference only and not required by the build tools.
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.msa b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.msa
index 62934eca9f..f8d225a5dc 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.msa
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.msa
@@ -96,6 +96,7 @@
<Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
<Extern>
<ModuleEntryPoint>Ip4DriverEntryPoint</ModuleEntryPoint>
+ <ModuleUnloadImage>NetLibDefaultUnload</ModuleUnloadImage>
</Extern>
</Externs>
</ModuleSurfaceArea> \ No newline at end of file
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c b/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c
index 932b21c5ef..7303f6b40e 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c
@@ -547,13 +547,13 @@ Returns:
--*/
{
- return NetLibInstallAllDriverProtocols (
- ImageHandle,
- SystemTable,
- &gMnpDriverBinding,
- ImageHandle,
- &gMnpComponentName,
- NULL,
- NULL
- );
+ return EfiLibInstallAllDriverProtocols (
+ ImageHandle,
+ SystemTable,
+ &gMnpDriverBinding,
+ ImageHandle,
+ &gMnpComponentName,
+ NULL,
+ NULL
+ );
}
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf b/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
index dd4a63cc3a..1eef0e54dd 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
@@ -25,7 +25,7 @@
EFI_SPECIFICATION_VERSION = 0x00020000
ENTRY_POINT = MnpDriverEntryPoint
-
+ UNLOAD_IMAGE = NetLibDefaultUnload
#
# The following information is for reference only and not required by the build tools.
#
diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.msa b/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.msa
index ba180ac4b7..718e1b9a7b 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.msa
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.msa
@@ -65,6 +65,7 @@
<Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
<Extern>
<ModuleEntryPoint>MnpDriverEntryPoint</ModuleEntryPoint>
+ <ModuleUnloadImage>NetLibDefaultUnload</ModuleUnloadImage>
</Extern>
</Externs>
</ModuleSurfaceArea> \ No newline at end of file
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c
index 5a15f9a6f1..835dfe0b80 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c
@@ -58,7 +58,7 @@ Returns:
--*/
{
- return NetLibInstallAllDriverProtocols (
+ return EfiLibInstallAllDriverProtocols (
ImageHandle,
SystemTable,
&gMtftp4DriverBinding,
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
index dedd23fc72..5ef5de9123 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
@@ -24,7 +24,7 @@
EFI_SPECIFICATION_VERSION = 0x00020000
ENTRY_POINT = Mtftp4DriverEntryPoint
-
+ UNLOAD_IMAGE = NetLibDefaultUnload
#
# The following information is for reference only and not required by the build tools.
#
diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.msa b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.msa
index e13da6563d..2f07834dde 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.msa
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.msa
@@ -74,6 +74,7 @@
<Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
<Extern>
<ModuleEntryPoint>Mtftp4DriverEntryPoint</ModuleEntryPoint>
+ <ModuleUnloadImage>NetLibDefaultUnload</ModuleUnloadImage>
</Extern>
</Externs>
</ModuleSurfaceArea> \ No newline at end of file
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c
index 1eefb38f91..bbd5a30a7b 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c
@@ -176,7 +176,7 @@ Returns:
//
// Install the TCP4 Driver Binding Protocol
//
- Status = NetLibInstallAllDriverProtocols (
+ Status = EfiLibInstallAllDriverProtocols (
ImageHandle,
SystemTable,
&mTcp4DriverBinding,
@@ -185,7 +185,7 @@ Returns:
NULL,
NULL
);
-
+ ASSERT_EFI_ERROR (Status);
//
// Initialize ISS and random port.
//
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
index 86c88a9506..6e013f79f0 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
@@ -25,7 +25,7 @@
EFI_SPECIFICATION_VERSION = 0x00020000
ENTRY_POINT = Tcp4DriverEntryPoint
-
+ UNLOAD_IMAGE = NetLibDefaultUnload
#
# The following information is for reference only and not required by the build tools.
#
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.msa b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.msa
index 4285d62c08..7fca1f5872 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.msa
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.msa
@@ -85,6 +85,7 @@
<Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
<Extern>
<ModuleEntryPoint>Tcp4DriverEntryPoint</ModuleEntryPoint>
+ <ModuleUnloadImage>NetLibDefaultUnload</ModuleUnloadImage>
</Extern>
</Externs>
</ModuleSurfaceArea> \ No newline at end of file
diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c
index 624c54a4d5..dc6fd48ebf 100644
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c
+++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c
@@ -504,7 +504,7 @@ Returns:
//
// Install the Udp4DriverBinding and Udp4ComponentName protocols.
//
- Status = NetLibInstallAllDriverProtocols (
+ Status = EfiLibInstallAllDriverProtocols (
ImageHandle,
SystemTable,
&gUdp4DriverBinding,
diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
index 625c64af08..06ee75f20d 100644
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
+++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
@@ -25,7 +25,7 @@
EFI_SPECIFICATION_VERSION = 0x00020000
ENTRY_POINT = Udp4DriverEntryPoint
-
+ UNLOAD_IMAGE = NetLibDefaultUnload
#
# The following information is for reference only and not required by the build tools.
#
diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.msa b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.msa
index 28a47f9c1b..451acf05ba 100644
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.msa
+++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.msa
@@ -72,6 +72,7 @@
<Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
<Extern>
<ModuleEntryPoint>Udp4DriverEntryPoint</ModuleEntryPoint>
+ <ModuleUnloadImage>NetLibDefaultUnload</ModuleUnloadImage>
</Extern>
</Externs>
</ModuleSurfaceArea> \ No newline at end of file