MdeModulePkg: Add unload support for SnpDxe and fix NULL ImageHandle in EfiLibInstall...

Signed-off-by: xdu2
Reviewed-by: vanjeff
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11967 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Snp.c b/MdeModulePkg/Universal/Network/SnpDxe/Snp.c
index e90e4e0244075d836f3a8934833a003d227c6762..2dc0536117c0ad1675deb1a146e10695f354f818 100644 (file)
--- a/MdeModulePkg/Universal/Network/SnpDxe/Snp.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/Snp.c
@@ -1,7 +1,7 @@
 /** @file\r
   Implementation of driver entry point and driver binding protocol.\r
 \r
-Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials are licensed\r
 and made available under the terms and conditions of the BSD License which\r
 accompanies this distribution. The full text of the license may be found at\r
@@ -1014,7 +1014,7 @@ InitializeSnpNiiDriver (
            ImageHandle,\r
            SystemTable,\r
            &mSimpleNetworkDriverBinding,\r
-           NULL,\r
+           ImageHandle,\r
            &gSimpleNetworkComponentName,\r
            &gSimpleNetworkComponentName2\r
            );\r

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf b/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
index 70dd3eeca70f543fc27dbb58d3ff4c1113213add..a7f81c83c5649e0e9259024bc1a53f7e0efc84a3 100644 (file)
--- a/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
+++ b/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #    Component description file for SNP module.\r
 #\r
-# Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
 # This program and the accompanying materials are licensed \r
 # and made available under the terms and conditions of the BSD License which \r
 # accompanies this distribution. The full text of the license may be found at \r
@@ -19,6 +19,7 @@
   MODULE_TYPE                    = UEFI_DRIVER\r
   VERSION_STRING                 = 1.0\r
   ENTRY_POINT                    = InitializeSnpNiiDriver\r
+  UNLOAD_IMAGE                   = NetLibDefaultUnload\r
 \r
 #\r
 # The following information is for reference only and not required by the build tools.\r
@@ -63,7 +64,7 @@
   UefiDriverEntryPoint\r
   BaseMemoryLib\r
   DebugLib\r
-\r
+  NetLib\r
 \r
 [Guids]\r
   gEfiEventExitBootServicesGuid                 ## CONSUMES\r