Revision: 19545
http://sourceforge.net/p/edk2/code/19545
Author: hwu1225
Date: 2015-12-25 03:12:08 +0000 (Fri, 25 Dec 2015)
Log Message:
-----------
ShellPkg: Add AIP IPv6 UNDI support to Shell dh
Update Shell DH command to decode and print the value of
gEfiAdapterInfoUndiIpv6SupportGuid AIP instance.
(Sync patch r19437 from main trunk.)
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Samer El-Haj-Mahmoud <[email protected]>
Reviewed-by: Jaben Carsey <[email protected]>
Revision Links:
--------------
http://sourceforge.net/p/edk2/code/19437
Modified Paths:
--------------
branches/UDK2015/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
branches/UDK2015/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
branches/UDK2015/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni
Modified:
branches/UDK2015/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
===================================================================
---
branches/UDK2015/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
2015-12-25 03:11:33 UTC (rev 19544)
+++
branches/UDK2015/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
2015-12-25 03:12:08 UTC (rev 19545)
@@ -1,9 +1,9 @@
/** @file
Provides interface to advanced shell functionality for parsing both handle
and protocol database.
+ Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.<BR>
+ (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>
(C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>
- (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>
- Copyright (c) 2010 - 2015, 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
@@ -690,6 +690,10 @@
TempRetVal = CatSPrint (RetVal, TempStr,
L"gEfiAdapterInfoSanMacAddressGuid");
SHELL_FREE_NON_NULL (RetVal);
RetVal = TempRetVal;
+ } else if (CompareGuid (&InfoTypesBuffer[GuidIndex],
&gEfiAdapterInfoUndiIpv6SupportGuid)) {
+ TempRetVal = CatSPrint (RetVal, TempStr,
L"gEfiAdapterInfoUndiIpv6SupportGuid");
+ SHELL_FREE_NON_NULL (RetVal);
+ RetVal = TempRetVal;
} else {
GuidStr = GetStringNameFromGuid (&InfoTypesBuffer[GuidIndex], NULL);
@@ -782,6 +786,19 @@
);
SHELL_FREE_NON_NULL (RetVal);
RetVal = TempRetVal;
+ } else if (CompareGuid (&InfoTypesBuffer[GuidIndex],
&gEfiAdapterInfoUndiIpv6SupportGuid) == TRUE) {
+ TempStr = HiiGetString (mHandleParsingHiiHandle,
STRING_TOKEN(STR_UNDI_IPV6_INFO), NULL);
+ if (TempStr == NULL) {
+ goto ERROR_EXIT;
+ }
+
+ TempRetVal = CatSPrint (
+ RetVal,
+ TempStr,
+ ((EFI_ADAPTER_INFO_UNDI_IPV6_SUPPORT
*)InformationBlock)->Ipv6Support
+ );
+ SHELL_FREE_NON_NULL (RetVal);
+ RetVal = TempRetVal;
} else {
TempStr = HiiGetString (mHandleParsingHiiHandle,
STRING_TOKEN(STR_UNKNOWN_INFO_TYPE), NULL);
if (TempStr == NULL) {
Modified:
branches/UDK2015/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
===================================================================
---
branches/UDK2015/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
2015-12-25 03:11:33 UTC (rev 19544)
+++
branches/UDK2015/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
2015-12-25 03:12:08 UTC (rev 19545)
@@ -1,7 +1,8 @@
## @file
# Provides interface to advanced shell functionality for parsing both handle
and protocol database.
+# Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved. <BR>
# (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>
-# Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved. <BR>
+# (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD
License
@@ -309,6 +310,7 @@
gEfiAdapterInfoMediaStateGuid ##
SOMETIMES_CONSUMES ## GUID
gEfiAdapterInfoNetworkBootGuid ##
SOMETIMES_CONSUMES ## GUID
gEfiAdapterInfoSanMacAddressGuid ##
SOMETIMES_CONSUMES ## GUID
+ gEfiAdapterInfoUndiIpv6SupportGuid ##
SOMETIMES_CONSUMES ## GUID
[Pcd.common]
gEfiShellPkgTokenSpaceGuid.PcdShellPrintBufferSize ## CONSUMES
Modified:
branches/UDK2015/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni
===================================================================
---
branches/UDK2015/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni
2015-12-25 03:11:33 UTC (rev 19544)
+++
branches/UDK2015/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni
2015-12-25 03:12:08 UTC (rev 19545)
@@ -1,7 +1,8 @@
// /**
//
+// Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved. <BR>
// (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>
-// Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved. <BR>
+// (C) Copyright 2015 Hewlett Packard Enterprise Development LP<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
@@ -395,5 +396,6 @@
" iScsiIpv6Boot
: %%H%d%%N\r\n"
" FCoeBoot
: %%H%d%%N\r\n"
#string STR_SAN_MAC_ADDRESS_INFO #language en-US " SanMacAddress:
%%H%02x-%02x-%02x-%02x-%02x-%02x%%N \r\n"
+#string STR_UNDI_IPV6_INFO #language en-US " UNDI IPv6
Supported: %%H%d%%N \r\n"
#string STR_UNKNOWN_INFO_TYPE #language en-US " The
'InformationType' - %%H%g%%N can't be recongnized\r\n"
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
