1. Add EFI_COMPONENT_NAME2_PROTOCOL.GetControllerName() support.

[mirror_edk2.git] / NetworkPkg / IScsiDxe / IScsiDriver.c

diff --git a/NetworkPkg/IScsiDxe/IScsiDriver.c b/NetworkPkg/IScsiDxe/IScsiDriver.c
index 7d8b18455c8cebc77f79f4dd0cbab936c4fa757f..2fd4c95a08ec3a7d673356c55787231ed0273498 100644 (file)
--- a/NetworkPkg/IScsiDxe/IScsiDriver.c
+++ b/NetworkPkg/IScsiDxe/IScsiDriver.c
@@ -1,7 +1,7 @@
 /** @file\r
   The entry point of IScsi driver.\r
 \r
-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -23,8 +23,8 @@ EFI_DRIVER_BINDING_PROTOCOL gIScsiDriverBinding = {
   NULL\r
 };\r
 \r
-EFI_GUID                    mIScsiV4PrivateGuid = ISCSI_V4_PRIVATE_GUID;\r
-EFI_GUID                    mIScsiV6PrivateGuid = ISCSI_V6_PRIVATE_GUID;\r
+EFI_GUID                    gIScsiV4PrivateGuid = ISCSI_V4_PRIVATE_GUID;\r
+EFI_GUID                    gIScsiV6PrivateGuid = ISCSI_V6_PRIVATE_GUID;\r
 ISCSI_PRIVATE_DATA          *mPrivate           = NULL;\r
 \r
 /**\r
@@ -121,7 +121,7 @@ IScsiDriverBindingSupported (
 \r
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
-                  &mIScsiV4PrivateGuid,\r
+                  &gIScsiV4PrivateGuid,\r
                   NULL,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
@@ -150,7 +150,7 @@ IScsiDriverBindingSupported (
 \r
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
-                  &mIScsiV6PrivateGuid,\r
+                  &gIScsiV6PrivateGuid,\r
                   NULL,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
@@ -231,11 +231,11 @@ IScsiStart (
   //\r
 \r
   if (IpVersion == IP_VERSION_4) {\r
-    IScsiPrivateGuid      = &mIScsiV4PrivateGuid;\r
+    IScsiPrivateGuid      = &gIScsiV4PrivateGuid;\r
     TcpServiceBindingGuid = &gEfiTcp4ServiceBindingProtocolGuid;\r
     ProtocolGuid          = &gEfiTcp4ProtocolGuid;\r
   } else if (IpVersion == IP_VERSION_6) {\r
-    IScsiPrivateGuid      = &mIScsiV6PrivateGuid;\r
+    IScsiPrivateGuid      = &gIScsiV6PrivateGuid;\r
     TcpServiceBindingGuid = &gEfiTcp6ServiceBindingProtocolGuid;\r
     ProtocolGuid          = &gEfiTcp6ProtocolGuid;\r
   } else {\r
@@ -931,13 +931,13 @@ IScsiDriverBindingStop (
   //\r
   IScsiController = NetLibGetNicHandle (ControllerHandle, &gEfiTcp4ProtocolGuid);\r
   if (IScsiController != NULL) {\r
-    ProtocolGuid            = &mIScsiV4PrivateGuid;\r
+    ProtocolGuid            = &gIScsiV4PrivateGuid;\r
     TcpProtocolGuid         = &gEfiTcp4ProtocolGuid;\r
     TcpServiceBindingGuid   = &gEfiTcp4ServiceBindingProtocolGuid;\r
   } else {\r
     IScsiController = NetLibGetNicHandle (ControllerHandle, &gEfiTcp6ProtocolGuid);\r
     ASSERT (IScsiController != NULL);\r
-    ProtocolGuid            = &mIScsiV6PrivateGuid;\r
+    ProtocolGuid            = &gIScsiV6PrivateGuid;\r
     TcpProtocolGuid         = &gEfiTcp6ProtocolGuid;\r
     TcpServiceBindingGuid   = &gEfiTcp6ServiceBindingProtocolGuid;\r
   }\r
@@ -1060,6 +1060,11 @@ IScsiUnload (
          &gIScsiAuthenticationInfo,\r
          NULL\r
          );\r
+\r
+  if (gIScsiControllerNameTable!= NULL) {\r
+    FreeUnicodeStringTable (gIScsiControllerNameTable);\r
+    gIScsiControllerNameTable = NULL;\r
+  }\r
   \r
   return gBS->UninstallMultipleProtocolInterfaces (\r
                 ImageHandle,\r