From 216f79703b8cb8dc65abdd768bedb2bcdbc1a1f8 Mon Sep 17 00:00:00 2001
From: sfu5 <sfu5@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 13 Dec 2012 06:47:06 +0000
Subject: 1. Add EFI_COMPONENT_NAME2_PROTOCOL.GetControllerName() support. 2.
 Fix the driver binding Stop() hang issue in the network stack. 3. Add Ip4 raw
 data support. 4. Add iSCSI Dhcp option 60 support.

Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
Reviewed-by: Ye Ting <ting.ye@intel.com>
Reviewed-by: Ouyang Qian <qian.ouyang@intel.com>

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13995 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../Universal/Network/IScsiDxe/ComponentName.c     | 40 ++++++++++++++++++++--
 1 file changed, 38 insertions(+), 2 deletions(-)

(limited to 'MdeModulePkg/Universal/Network/IScsiDxe')

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/ComponentName.c b/MdeModulePkg/Universal/Network/IScsiDxe/ComponentName.c
index acb9c0758d..e88587a4bb 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/ComponentName.c
@@ -1,7 +1,7 @@
 /** @file
   UEFI Component Name(2) protocol implementation for iSCSI.
 
-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -37,6 +37,11 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mIScsiDriverNameTable[] =
   {NULL, NULL}
 };
 
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE  mIScsiControllerNameTable[] = {
+  {"eng;en", L"iSCSI (IPv4)"},
+  {NULL, NULL}
+};
+
 /**
   Retrieves a Unicode string that is the user readable name of the EFI Driver.
 
@@ -131,5 +136,36 @@ IScsiComponentNameGetControllerName (
   OUT CHAR16                        **ControllerName
   )
 {
-  return EFI_UNSUPPORTED;
+  EFI_HANDLE                      IScsiController;
+  ISCSI_PRIVATE_PROTOCOL          *IScsiIdentifier;
+  EFI_STATUS                      Status;
+  
+  //
+  // Get the handle of the controller we are controling.
+  //
+  IScsiController = NetLibGetNicHandle (ControllerHandle, &gEfiTcp4ProtocolGuid);
+  if (IScsiController == NULL) {
+    return EFI_UNSUPPORTED;
+  }
+
+  Status = gBS->OpenProtocol (
+                  IScsiController,
+                  &gEfiCallerIdGuid,
+                  (VOID **)&IScsiIdentifier,
+                  NULL,
+                  NULL,
+                  EFI_OPEN_PROTOCOL_GET_PROTOCOL
+                  );
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
+  
+  return LookupUnicodeString2 (
+           Language,
+           This->SupportedLanguages,
+           mIScsiControllerNameTable,
+           ControllerName,
+           (BOOLEAN)(This == &gIScsiComponentName)
+           );
 }
+
-- 
cgit v1.2.3