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
2007-09-28 06:02:01 +00:00
parent ba7e162ec1
commit da1d02010d
26 changed files with 1284 additions and 1445 deletions
--- 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,
--- 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.
 #
--- 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>
--- 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,
--- 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.
 #
--- 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>
--- 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
           );
 }

--- 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.
 #
--- 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>
--- 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,
--- 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.
--- 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>
--- 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
+           );
 }
--- 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.
 #
--- 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>
--- 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,
--- 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.
 #
--- 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>
--- 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.
  //
--- 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.
 #
--- 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>
--- 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,
--- 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.
 #
--- 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>