ShellPkg: Add protocols / protocol GUIDs to display and input mapping.

This adds all protocols in the MdePkg.dec.

signed-off-by: jcarsey
reviewed-by: geekboy15a

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12920 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
index 9e5164821747bb976c032c178d7eba5d2d3947a3..44ad4c0b55d6cc36e7ab8426b2c81bd3d4fb7a6d 100644 (file)
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   Provides interface to advanced shell functionality for parsing both handle and protocol database.\r
 \r
-  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2010 - 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
@@ -333,14 +333,14 @@ STATIC CONST EFI_GUID WinNtThunkProtocolGuid = LOCAL_EFI_WIN_NT_THUNK_PROTOCOL_G
 STATIC CONST EFI_GUID WinNtIoProtocolGuid    = LOCAL_EFI_WIN_NT_BUS_DRIVER_IO_PROTOCOL_GUID;\r
 STATIC CONST EFI_GUID WinNtSerialPortGuid    = LOCAL_EFI_WIN_NT_SERIAL_PORT_GUID;\r
 \r
-STATIC CONST PROTOCOL_INFO_BLOCK mGuidStringListNT[] = {\r
+STATIC CONST GUID_INFO_BLOCK mGuidStringListNT[] = {\r
   {STRING_TOKEN(STR_WINNT_THUNK),           (EFI_GUID*)&WinNtThunkProtocolGuid,               NULL},\r
   {STRING_TOKEN(STR_WINNT_DRIVER_IO),       (EFI_GUID*)&WinNtIoProtocolGuid,                  NULL},\r
   {STRING_TOKEN(STR_WINNT_SERIAL_PORT),     (EFI_GUID*)&WinNtSerialPortGuid,                  NULL},\r
   {STRING_TOKEN(STR_UNKNOWN_DEVICE),        NULL,                                             NULL},\r
 };\r
 \r
-STATIC CONST PROTOCOL_INFO_BLOCK mGuidStringList[] = {\r
+STATIC CONST GUID_INFO_BLOCK mGuidStringList[] = {\r
   {STRING_TOKEN(STR_LOADED_IMAGE),          &gEfiLoadedImageProtocolGuid,                     NULL},\r
   {STRING_TOKEN(STR_DEVICE_PATH),           &gEfiDevicePathProtocolGuid,                      DevicePathProtocolDumpInformation},\r
   {STRING_TOKEN(STR_IMAGE_PATH),            &gEfiLoadedImageDevicePathProtocolGuid,           DevicePathProtocolDumpInformation},\r
@@ -376,8 +376,6 @@ STATIC CONST PROTOCOL_INFO_BLOCK mGuidStringList[] = {
   {STRING_TOKEN(STR_LOAD_FILE),             &gEfiLoadFileProtocolGuid,                        NULL},\r
   {STRING_TOKEN(STR_LOAD_FILE2),            &gEfiLoadFile2ProtocolGuid,                       NULL},\r
   {STRING_TOKEN(STR_SIMPLE_FILE_SYS),       &gEfiSimpleFileSystemProtocolGuid,                NULL},\r
-  {STRING_TOKEN(STR_FILE_INFO),             &gEfiFileInfoGuid,                                NULL},\r
-  {STRING_TOKEN(STR_FILE_SYS_INFO),         &gEfiFileSystemInfoGuid,                          NULL},\r
   {STRING_TOKEN(STR_TAPE_IO),               &gEfiTapeIoProtocolGuid,                          NULL},\r
   {STRING_TOKEN(STR_DISK_IO),               &gEfiDiskIoProtocolGuid,                          NULL},\r
   {STRING_TOKEN(STR_BLK_IO),                &gEfiBlockIoProtocolGuid,                         NULL},\r
@@ -416,7 +414,6 @@ STATIC CONST PROTOCOL_INFO_BLOCK mGuidStringList[] = {
   {STRING_TOKEN(STR_IPV4_CFG),              &gEfiIp4ConfigProtocolGuid,                       NULL},\r
   {STRING_TOKEN(STR_SHELL_PARAMETERS),      &gEfiShellParametersProtocolGuid,                 NULL},\r
   {STRING_TOKEN(STR_SHELL),                 &gEfiShellProtocolGuid,                           NULL},\r
-  {STRING_TOKEN(STR_EFI_GLOBAL_VARIABLE),   &gEfiGlobalVariableGuid,                          NULL},\r
   {STRING_TOKEN(STR_UDPV4_SB),              &gEfiUdp4ServiceBindingProtocolGuid,              NULL},\r
   {STRING_TOKEN(STR_UDPV4),                 &gEfiUdp4ProtocolGuid,                            NULL},\r
   {STRING_TOKEN(STR_MTFTPV4_SB),            &gEfiMtftp4ServiceBindingProtocolGuid,            NULL},\r
@@ -431,6 +428,14 @@ STATIC CONST PROTOCOL_INFO_BLOCK mGuidStringList[] = {
   {STRING_TOKEN(STR_HII_CONFIG_ROUT),       &gEfiHiiConfigRoutingProtocolGuid,                NULL},\r
   {STRING_TOKEN(STR_HII_CONFIG_ACC),        &gEfiHiiConfigAccessProtocolGuid,                 NULL},\r
   {STRING_TOKEN(STR_HII_FORM_BROWSER2),     &gEfiFormBrowser2ProtocolGuid,                    NULL},\r
+  {STRING_TOKEN(STR_DRIVER_FAM_OVERRIDE),   &gEfiDriverFamilyOverrideProtocolGuid,            NULL},\r
+  {STRING_TOKEN(STR_PCD),                   &gPcdProtocolGuid,                                NULL},\r
+  {STRING_TOKEN(STR_TCG),                   &gEfiTcgProtocolGuid,                             NULL},\r
+  {STRING_TOKEN(STR_HII_PACKAGE_LIST),      &gEfiHiiPackageListProtocolGuid,                  NULL},\r
+\r
+//\r
+// the ones under this are deprecated by the current UEFI Spec, but may be found anyways...\r
+//\r
   {STRING_TOKEN(STR_SHELL_INTERFACE),       &gEfiShellInterfaceGuid,                          NULL},\r
   {STRING_TOKEN(STR_SHELL_ENV2),            &gEfiShellEnvironment2Guid,                       NULL},\r
   {STRING_TOKEN(STR_SHELL_ENV),             &gEfiShellEnvironment2Guid,                       NULL},\r
@@ -441,6 +446,62 @@ STATIC CONST PROTOCOL_INFO_BLOCK mGuidStringList[] = {
   {STRING_TOKEN(STR_GPT_NBR),               &gEfiPartTypeLegacyMbrGuid,                       NULL},\r
   {STRING_TOKEN(STR_DRIVER_CONFIG),         &gEfiDriverConfigurationProtocolGuid,             NULL},\r
   {STRING_TOKEN(STR_DRIVER_CONFIG2),        &gEfiDriverConfiguration2ProtocolGuid,            NULL},\r
+\r
+//\r
+// the ones under this are GUID identified structs, not protocols\r
+//\r
+  {STRING_TOKEN(STR_FILE_INFO),             &gEfiFileInfoGuid,                                NULL},\r
+  {STRING_TOKEN(STR_FILE_SYS_INFO),         &gEfiFileSystemInfoGuid,                          NULL},\r
+\r
+//\r
+// the ones under this are misc GUIDS.\r
+//\r
+  {STRING_TOKEN(STR_EFI_GLOBAL_VARIABLE),   &gEfiGlobalVariableGuid,                          NULL},\r
+\r
+//\r
+// UEFI 2.2\r
+//\r
+  {STRING_TOKEN(STR_IP6_SB),                &gEfiIp6ServiceBindingProtocolGuid,               NULL},\r
+  {STRING_TOKEN(STR_IP6),                   &gEfiIp6ProtocolGuid,                             NULL},\r
+  {STRING_TOKEN(STR_IP6_CONFIG),            &gEfiIp6ConfigProtocolGuid,                       NULL},\r
+  {STRING_TOKEN(STR_MTFTP6_SB),             &gEfiMtftp6ServiceBindingProtocolGuid,            NULL},\r
+  {STRING_TOKEN(STR_MTFTP6),                &gEfiMtftp6ProtocolGuid,                          NULL},\r
+  {STRING_TOKEN(STR_DHCP6_SB),              &gEfiDhcp6ServiceBindingProtocolGuid,             NULL},\r
+  {STRING_TOKEN(STR_DHCP6),                 &gEfiDhcp6ProtocolGuid,                           NULL},\r
+  {STRING_TOKEN(STR_UDP6_SB),               &gEfiUdp6ServiceBindingProtocolGuid,              NULL},\r
+  {STRING_TOKEN(STR_UDP6),                  &gEfiUdp6ProtocolGuid,                            NULL},\r
+  {STRING_TOKEN(STR_TCP6_SB),               &gEfiTcp6ServiceBindingProtocolGuid,              NULL},\r
+  {STRING_TOKEN(STR_TCP6),                  &gEfiTcp6ProtocolGuid,                            NULL},\r
+  {STRING_TOKEN(STR_VLAN_CONFIG),           &gEfiVlanConfigProtocolGuid,                      NULL},\r
+  {STRING_TOKEN(STR_EAP),                   &gEfiEapProtocolGuid,                             NULL},\r
+  {STRING_TOKEN(STR_EAP_MGMT),              &gEfiEapManagementProtocolGuid,                   NULL},\r
+  {STRING_TOKEN(STR_FTP4_SB),               &gEfiFtp4ServiceBindingProtocolGuid,              NULL},\r
+  {STRING_TOKEN(STR_FTP4),                  &gEfiFtp4ProtocolGuid,                            NULL},\r
+  {STRING_TOKEN(STR_IP_SEC_CONFIG),         &gEfiIpSecConfigProtocolGuid,                     NULL},\r
+  {STRING_TOKEN(STR_DH),                    &gEfiDriverHealthProtocolGuid,                    NULL},\r
+  {STRING_TOKEN(STR_DEF_IMG_LOAD),          &gEfiDeferredImageLoadProtocolGuid,               NULL},\r
+  {STRING_TOKEN(STR_USER_CRED),             &gEfiUserCredentialProtocolGuid,                  NULL},\r
+  {STRING_TOKEN(STR_USER_MNGR),             &gEfiUserManagerProtocolGuid,                     NULL},\r
+  {STRING_TOKEN(STR_ATA_PASS_THRU),         &gEfiAtaPassThruProtocolGuid,                     NULL},\r
+\r
+//\r
+// UEFI 2.3\r
+//\r
+  {STRING_TOKEN(STR_FW_MGMT),               &gEfiFirmwareManagementProtocolGuid,              NULL},\r
+  {STRING_TOKEN(STR_IP_SEC),                &gEfiIpSecProtocolGuid,                           NULL},\r
+  {STRING_TOKEN(STR_IP_SEC2),               &gEfiIpSec2ProtocolGuid,                          NULL},\r
+\r
+//\r
+// UEFI 2.3.1\r
+//\r
+  {STRING_TOKEN(STR_KMS),                   &gEfiKmsProtocolGuid,                             NULL},\r
+  {STRING_TOKEN(STR_BLK_IO2),               &gEfiBlockIo2ProtocolGuid,                        NULL},\r
+  {STRING_TOKEN(STR_SSC),                   &gEfiStorageSecurityCommandProtocolGuid,          NULL},\r
+  {STRING_TOKEN(STR_UC2),                   &gEfiUserCredential2ProtocolGuid,                 NULL},\r
+\r
+//\r
+// terminator\r
+//\r
   {STRING_TOKEN(STR_UNKNOWN_DEVICE),        NULL,                                             NULL},\r
 };\r
 \r
@@ -453,13 +514,13 @@ STATIC CONST PROTOCOL_INFO_BLOCK mGuidStringList[] = {
 \r
   @return                       The node.\r
 **/\r
-CONST PROTOCOL_INFO_BLOCK *\r
+CONST GUID_INFO_BLOCK *\r
 EFIAPI\r
 InternalShellGetNodeFromGuid(\r
   IN CONST EFI_GUID* Guid\r
   )\r
 {\r
-  CONST PROTOCOL_INFO_BLOCK *ListWalker;\r
+  CONST GUID_INFO_BLOCK *ListWalker;\r
 \r
   ASSERT(Guid != NULL);\r
 \r
@@ -496,7 +557,7 @@ GetStringNameFromGuid(
   IN CONST CHAR8    *Lang OPTIONAL\r
   )\r
 {\r
-  CONST PROTOCOL_INFO_BLOCK *Id;\r
+  CONST GUID_INFO_BLOCK *Id;\r
 \r
   Id = InternalShellGetNodeFromGuid(Guid);\r
   return (HiiGetString(mHandleParsingHiiHandle, Id->StringId, Lang));\r
@@ -526,7 +587,7 @@ GetProtocolInformationDump(
   IN CONST BOOLEAN    Verbose\r
   )\r
 {\r
-  CONST PROTOCOL_INFO_BLOCK *Id;\r
+  CONST GUID_INFO_BLOCK *Id;\r
 \r
   ASSERT(TheHandle  != NULL);\r
   ASSERT(Guid       != NULL);\r
@@ -559,7 +620,7 @@ GetGuidFromStringName(
   IN EFI_GUID     **Guid\r
   )\r
 {\r
-  CONST PROTOCOL_INFO_BLOCK  *ListWalker;\r
+  CONST GUID_INFO_BLOCK  *ListWalker;\r
   CHAR16                     *String;\r
 \r
   ASSERT(Guid != NULL);\r

diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h
index 39b2e6535c844a76e2d59fb433c5cc27befc6a62..3b1ad2bac469159b4275d63159d4206e76554898 100644 (file)
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h
@@ -1,7 +1,7 @@
 /** @file\r
   Provides interface to advanced shell functionality for parsing both handle and protocol database.\r
 \r
-  Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2011 - 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
@@ -104,6 +104,32 @@
 #include <Protocol/DevicePathUtilities.h>\r
 //#include <Protocol/FirmwareVolume.h>\r
 //#include <Protocol/FirmwareVolume2.h>\r
+#include <Protocol/DriverFamilyOverride.h>\r
+#include <Protocol/Pcd.h>\r
+#include <Protocol/TcgService.h>\r
+#include <Protocol/HiiPackageList.h>\r
+#include <Protocol/Ip6.h>\r
+#include <Protocol/Ip6Config.h>\r
+#include <Protocol/Mtftp6.h>\r
+#include <Protocol/Dhcp6.h>\r
+#include <Protocol/Udp6.h>\r
+#include <Protocol/Tcp6.h>\r
+#include <Protocol/VlanConfig.h>\r
+#include <Protocol/Eap.h>\r
+#include <Protocol/EapManagement.h>\r
+#include <Protocol/Ftp4.h>\r
+#include <Protocol/IpSecConfig.h>\r
+#include <Protocol/DriverHealth.h>\r
+#include <Protocol/DeferredImageLoad.h>\r
+#include <Protocol/UserCredential.h>\r
+#include <Protocol/UserManager.h>\r
+#include <Protocol/AtaPassThru.h>\r
+#include <Protocol/FirmwareManagement.h>\r
+#include <Protocol/IpSec.h>\r
+#include <Protocol/Kms.h>\r
+#include <Protocol/BlockIo2.h>\r
+#include <Protocol/StorageSecurityCommand.h>\r
+#include <Protocol/UserCredential2.h>\r
 \r
 #include <Library/HandleParsingLib.h>\r
 #include <Library/UefiBootServicesTableLib.h>\r
@@ -136,12 +162,11 @@ CHAR16 *
   IN CONST BOOLEAN    Verbose\r
   );\r
 \r
-\r
-typedef struct {\r
+typedef struct _GUID_INFO_BLOCK{\r
   EFI_STRING_ID                 StringId;\r
   EFI_GUID                      *GuidId;\r
   DUMP_PROTOCOL_INFO            DumpInfo;\r
-} PROTOCOL_INFO_BLOCK;\r
+} GUID_INFO_BLOCK;\r
 \r
 #endif\r
 \r

diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
index 46d918611a59b22f1f09cc98d0fa1cb36d0e5038..ddba0cfa181a1e1807433963aa616f43f855191f 100644 (file)
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
@@ -1,6 +1,6 @@
 ##  @file\r
 #  Provides interface to advanced shell functionality for parsing both handle and protocol database.\r
-#  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved. <BR>\r
+#  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved. <BR>\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -49,109 +49,142 @@
   HiiLib\r
 \r
 [Protocols]\r
-  gEfiSimpleFileSystemProtocolGuid              # ALWAYS_CONSUMED\r
+  gEfiSimpleFileSystemProtocolGuid                        ##CONSUMES\r
 \r
   # shell 2.0\r
-  gEfiShellProtocolGuid                         # SOMETIMES_CONSUMED\r
-  gEfiShellParametersProtocolGuid               # SOMETIMES_CONSUMED\r
+  gEfiShellProtocolGuid                                   ##SOMETIMES_CONSUMED\r
+  gEfiShellParametersProtocolGuid                         ##SOMETIMES_CONSUMED\r
 \r
   # 'old' shell\r
-  gEfiShellEnvironment2Guid                     # SOMETIMES_CONSUMED\r
-  gEfiShellInterfaceGuid                        # SOMETIMES_CONSUMED\r
+  gEfiShellEnvironment2Guid                               ##SOMETIMES_CONSUMED\r
+  gEfiShellInterfaceGuid                                  ##SOMETIMES_CONSUMED\r
 \r
-  gEfiUnicodeCollation2ProtocolGuid                       # ALWAYS_CONSUMED\r
-  gEfiDevicePathToTextProtocolGuid                        # ALWAYS_CONSUMED\r
-  gEfiBusSpecificDriverOverrideProtocolGuid               # ALWAYS_CONSUMED\r
-  gEfiDevicePathUtilitiesProtocolGuid                     # ALWAYS_CONSUMED\r
-  gEfiDevicePathFromTextProtocolGuid                      # ALWAYS_CONSUMED\r
-  gEfiPlatformDriverOverrideProtocolGuid                  # ALWAYS_CONSUMED\r
-  gEfiSimpleTextInProtocolGuid                            # ALWAYS_CONSUMED\r
-  gEfiPlatformToDriverConfigurationProtocolGuid           # ALWAYS_CONSUMED\r
-  gEfiDriverSupportedEfiVersionProtocolGuid               # ALWAYS_CONSUMED\r
-  gEfiLoadedImageProtocolGuid                             # ALWAYS_CONSUMED\r
-  gEfiDevicePathProtocolGuid                              # ALWAYS_CONSUMED\r
-  gEfiLoadedImageDevicePathProtocolGuid                   # ALWAYS_CONSUMED\r
-  gEfiSimpleTextOutProtocolGuid\r
-  gEfiSimplePointerProtocolGuid\r
-  gEfiAbsolutePointerProtocolGuid\r
-  gEfiSerialIoProtocolGuid\r
-  gEfiEdidDiscoveredProtocolGuid\r
-  gEfiEdidActiveProtocolGuid\r
-  gEfiEdidOverrideProtocolGuid\r
-  gEfiLoadFileProtocolGuid\r
-  gEfiLoadFile2ProtocolGuid\r
-  gEfiTapeIoProtocolGuid\r
-  gEfiDiskIoProtocolGuid\r
-  gEfiBlockIoProtocolGuid\r
-  gEfiUnicodeCollationProtocolGuid\r
-  gEfiPciRootBridgeIoProtocolGuid\r
-  gEfiPciIoProtocolGuid\r
-  gEfiScsiPassThruProtocolGuid\r
-  gEfiScsiIoProtocolGuid\r
-  gEfiExtScsiPassThruProtocolGuid\r
-  gEfiIScsiInitiatorNameProtocolGuid\r
-  gEfiUsbIoProtocolGuid\r
-  gEfiUsbHcProtocolGuid\r
-  gEfiUsb2HcProtocolGuid\r
-  gEfiDebugSupportProtocolGuid\r
-  gEfiDebugPortProtocolGuid\r
-  gEfiDecompressProtocolGuid\r
-  gEfiAcpiTableProtocolGuid\r
-  gEfiEbcProtocolGuid\r
-  gEfiSimpleNetworkProtocolGuid\r
-  gEfiNetworkInterfaceIdentifierProtocolGuid\r
-  gEfiNetworkInterfaceIdentifierProtocolGuid_31\r
-  gEfiPxeBaseCodeProtocolGuid\r
-  gEfiPxeBaseCodeCallbackProtocolGuid\r
-  gEfiBisProtocolGuid\r
-  gEfiManagedNetworkServiceBindingProtocolGuid\r
-  gEfiManagedNetworkProtocolGuid\r
-  gEfiArpServiceBindingProtocolGuid\r
-  gEfiArpProtocolGuid\r
-  gEfiDhcp4ServiceBindingProtocolGuid\r
-  gEfiDhcp4ProtocolGuid\r
-  gEfiTcp4ServiceBindingProtocolGuid\r
-  gEfiTcp4ProtocolGuid\r
-  gEfiIp4ServiceBindingProtocolGuid\r
-  gEfiIp4ProtocolGuid\r
-  gEfiIp4ConfigProtocolGuid\r
-  gEfiUdp4ServiceBindingProtocolGuid\r
-  gEfiUdp4ProtocolGuid\r
-  gEfiMtftp4ServiceBindingProtocolGuid\r
-  gEfiMtftp4ProtocolGuid\r
-  gEfiAuthenticationInfoProtocolGuid\r
-  gEfiHashServiceBindingProtocolGuid\r
-  gEfiHashProtocolGuid\r
-  gEfiHiiFontProtocolGuid\r
-  gEfiHiiStringProtocolGuid\r
-  gEfiHiiImageProtocolGuid\r
-  gEfiHiiConfigRoutingProtocolGuid\r
-  gEfiHiiConfigAccessProtocolGuid\r
-  gEfiFormBrowser2ProtocolGuid\r
-  gEfiDeviceIoProtocolGuid\r
-  gEfiUgaDrawProtocolGuid\r
-  gEfiUgaIoProtocolGuid\r
-  gEfiDriverConfigurationProtocolGuid\r
-  gEfiDriverConfiguration2ProtocolGuid\r
-  gEfiSimpleTextInputExProtocolGuid\r
+  gEfiUnicodeCollation2ProtocolGuid                       ##CONSUMES\r
+  gEfiDevicePathToTextProtocolGuid                        ##CONSUMES\r
+  gEfiBusSpecificDriverOverrideProtocolGuid               ##CONSUMES\r
+  gEfiDevicePathUtilitiesProtocolGuid                     ##CONSUMES\r
+  gEfiDevicePathFromTextProtocolGuid                      ##CONSUMES\r
+  gEfiPlatformDriverOverrideProtocolGuid                  ##CONSUMES\r
+  gEfiSimpleTextInProtocolGuid                            ##CONSUMES\r
+  gEfiPlatformToDriverConfigurationProtocolGuid           ##CONSUMES\r
+  gEfiDriverSupportedEfiVersionProtocolGuid               ##CONSUMES\r
+  gEfiLoadedImageProtocolGuid                             ##CONSUMES\r
+  gEfiDevicePathProtocolGuid                              ##CONSUMES\r
+  gEfiLoadedImageDevicePathProtocolGuid                   ##CONSUMES\r
+  gEfiSimpleTextOutProtocolGuid                           ##UNDEFINED\r
+  gEfiSimplePointerProtocolGuid                           ##UNDEFINED\r
+  gEfiAbsolutePointerProtocolGuid                         ##UNDEFINED\r
+  gEfiSerialIoProtocolGuid                                ##UNDEFINED\r
+  gEfiEdidDiscoveredProtocolGuid                          ##UNDEFINED\r
+  gEfiEdidActiveProtocolGuid                              ##UNDEFINED\r
+  gEfiEdidOverrideProtocolGuid                            ##UNDEFINED\r
+  gEfiLoadFileProtocolGuid                                ##UNDEFINED\r
+  gEfiLoadFile2ProtocolGuid                               ##UNDEFINED\r
+  gEfiTapeIoProtocolGuid                                  ##UNDEFINED\r
+  gEfiDiskIoProtocolGuid                                  ##UNDEFINED\r
+  gEfiBlockIoProtocolGuid                                 ##UNDEFINED\r
+  gEfiUnicodeCollationProtocolGuid                        ##UNDEFINED\r
+  gEfiPciRootBridgeIoProtocolGuid                         ##UNDEFINED\r
+  gEfiPciIoProtocolGuid                                   ##UNDEFINED\r
+  gEfiScsiPassThruProtocolGuid                            ##UNDEFINED\r
+  gEfiScsiIoProtocolGuid                                  ##UNDEFINED\r
+  gEfiExtScsiPassThruProtocolGuid                         ##UNDEFINED\r
+  gEfiIScsiInitiatorNameProtocolGuid                      ##UNDEFINED\r
+  gEfiUsbIoProtocolGuid                                   ##UNDEFINED\r
+  gEfiUsbHcProtocolGuid                                   ##UNDEFINED\r
+  gEfiUsb2HcProtocolGuid                                  ##UNDEFINED\r
+  gEfiDebugSupportProtocolGuid                            ##UNDEFINED\r
+  gEfiDebugPortProtocolGuid                               ##UNDEFINED\r
+  gEfiDecompressProtocolGuid                              ##UNDEFINED\r
+  gEfiAcpiTableProtocolGuid                               ##UNDEFINED\r
+  gEfiEbcProtocolGuid                                     ##UNDEFINED\r
+  gEfiSimpleNetworkProtocolGuid                           ##UNDEFINED\r
+  gEfiNetworkInterfaceIdentifierProtocolGuid              ##UNDEFINED\r
+  gEfiNetworkInterfaceIdentifierProtocolGuid_31           ##UNDEFINED\r
+  gEfiPxeBaseCodeProtocolGuid                             ##UNDEFINED\r
+  gEfiPxeBaseCodeCallbackProtocolGuid                     ##UNDEFINED\r
+  gEfiBisProtocolGuid                                     ##UNDEFINED\r
+  gEfiManagedNetworkServiceBindingProtocolGuid            ##UNDEFINED\r
+  gEfiManagedNetworkProtocolGuid                          ##UNDEFINED\r
+  gEfiArpServiceBindingProtocolGuid                       ##UNDEFINED\r
+  gEfiArpProtocolGuid                                     ##UNDEFINED\r
+  gEfiDhcp4ServiceBindingProtocolGuid                     ##UNDEFINED\r
+  gEfiDhcp4ProtocolGuid                                   ##UNDEFINED\r
+  gEfiTcp4ServiceBindingProtocolGuid                      ##UNDEFINED\r
+  gEfiTcp4ProtocolGuid                                    ##UNDEFINED\r
+  gEfiIp4ServiceBindingProtocolGuid                       ##UNDEFINED\r
+  gEfiIp4ProtocolGuid                                     ##UNDEFINED\r
+  gEfiIp4ConfigProtocolGuid                               ##UNDEFINED\r
+  gEfiUdp4ServiceBindingProtocolGuid                      ##UNDEFINED\r
+  gEfiUdp4ProtocolGuid                                    ##UNDEFINED\r
+  gEfiMtftp4ServiceBindingProtocolGuid                    ##UNDEFINED\r
+  gEfiMtftp4ProtocolGuid                                  ##UNDEFINED\r
+  gEfiAuthenticationInfoProtocolGuid                      ##UNDEFINED\r
+  gEfiHashServiceBindingProtocolGuid                      ##UNDEFINED\r
+  gEfiHashProtocolGuid                                    ##UNDEFINED\r
+  gEfiHiiFontProtocolGuid                                 ##UNDEFINED\r
+  gEfiHiiStringProtocolGuid                               ##UNDEFINED\r
+  gEfiHiiImageProtocolGuid                                ##UNDEFINED\r
+  gEfiHiiConfigRoutingProtocolGuid                        ##UNDEFINED\r
+  gEfiHiiConfigAccessProtocolGuid                         ##UNDEFINED\r
+  gEfiFormBrowser2ProtocolGuid                            ##UNDEFINED\r
+  gEfiDeviceIoProtocolGuid                                ##UNDEFINED\r
+  gEfiUgaDrawProtocolGuid                                 ##UNDEFINED\r
+  gEfiUgaIoProtocolGuid                                   ##UNDEFINED\r
+  gEfiDriverConfigurationProtocolGuid                     ##UNDEFINED\r
+  gEfiDriverConfiguration2ProtocolGuid                    ##UNDEFINED\r
+  gEfiSimpleTextInputExProtocolGuid                       ##UNDEFINED\r
+  gEfiIp6ServiceBindingProtocolGuid                       ##UNDEFINED\r
+  gEfiIp6ProtocolGuid                                     ##UNDEFINED\r
+  gEfiIp6ConfigProtocolGuid                               ##UNDEFINED\r
+  gEfiMtftp6ServiceBindingProtocolGuid                    ##UNDEFINED\r
+  gEfiMtftp6ProtocolGuid                                  ##UNDEFINED\r
+  gEfiDhcp6ServiceBindingProtocolGuid                     ##UNDEFINED\r
+  gEfiDhcp6ProtocolGuid                                   ##UNDEFINED\r
+  gEfiUdp6ServiceBindingProtocolGuid                      ##UNDEFINED\r
+  gEfiUdp6ProtocolGuid                                    ##UNDEFINED\r
+  gEfiTcp6ServiceBindingProtocolGuid                      ##UNDEFINED\r
+  gEfiTcp6ProtocolGuid                                    ##UNDEFINED\r
+  gEfiVlanConfigProtocolGuid                              ##UNDEFINED\r
+  gEfiEapProtocolGuid                                     ##UNDEFINED\r
+  gEfiEapManagementProtocolGuid                           ##UNDEFINED\r
+  gEfiFtp4ServiceBindingProtocolGuid                      ##UNDEFINED\r
+  gEfiFtp4ProtocolGuid                                    ##UNDEFINED\r
+  gEfiIpSecConfigProtocolGuid                             ##UNDEFINED\r
+  gEfiDriverHealthProtocolGuid                            ##UNDEFINED\r
+  gEfiDeferredImageLoadProtocolGuid                       ##UNDEFINED\r
+  gEfiUserCredentialProtocolGuid                          ##UNDEFINED\r
+  gEfiUserManagerProtocolGuid                             ##UNDEFINED\r
+  gEfiAtaPassThruProtocolGuid                             ##UNDEFINED\r
+  gEfiFirmwareManagementProtocolGuid                      ##UNDEFINED\r
+  gEfiIpSecProtocolGuid                                   ##UNDEFINED\r
+  gEfiIpSec2ProtocolGuid                                  ##UNDEFINED\r
+  gEfiKmsProtocolGuid                                     ##UNDEFINED\r
+  gEfiBlockIo2ProtocolGuid                                ##UNDEFINED\r
+  gEfiStorageSecurityCommandProtocolGuid                  ##UNDEFINED\r
+  gEfiUserCredential2ProtocolGuid                         ##UNDEFINED\r
+  gPcdProtocolGuid                                        ##UNDEFINED\r
+  gEfiTcgProtocolGuid                                     ##UNDEFINED\r
+  gEfiHiiPackageListProtocolGuid                          ##UNDEFINED\r
+  gEfiDriverFamilyOverrideProtocolGuid                    ##UNDEFINED\r
 \r
 [Guids]\r
-  gEfiFileInfoGuid                              # ALWAYS_CONSUMED\r
-  gEfiShellEnvironment2ExtGuid                  # ALWAYS_CONSUMED\r
-  gEfiPcAnsiGuid\r
-  gEfiVT100Guid\r
-  gEfiVT100PlusGuid\r
-  gEfiVTUTF8Guid\r
-  gEfiStandardErrorDeviceGuid\r
-  gEfiConsoleInDeviceGuid\r
-  gEfiConsoleOutDeviceGuid\r
-  gEfiFileSystemInfoGuid\r
-  gEfiGlobalVariableGuid\r
-  gEfiPartTypeSystemPartGuid\r
-  gEfiPartTypeLegacyMbrGuid\r
-  gHandleParsingHiiGuid\r
+  gEfiFileInfoGuid                                        ##CONSUMES\r
+  gEfiShellEnvironment2ExtGuid                            ##CONSUMES\r
+  gEfiPcAnsiGuid                                          ##UNDEFINED\r
+  gEfiVT100Guid                                           ##UNDEFINED\r
+  gEfiVT100PlusGuid                                       ##UNDEFINED\r
+  gEfiVTUTF8Guid                                          ##UNDEFINED\r
+  gEfiStandardErrorDeviceGuid                             ##UNDEFINED\r
+  gEfiConsoleInDeviceGuid                                 ##UNDEFINED\r
+  gEfiConsoleOutDeviceGuid                                ##UNDEFINED\r
+  gEfiFileSystemInfoGuid                                  ##UNDEFINED\r
+  gEfiGlobalVariableGuid                                  ##UNDEFINED\r
+  gEfiPartTypeSystemPartGuid                              ##UNDEFINED\r
+  gEfiPartTypeLegacyMbrGuid                               ##UNDEFINED\r
+  gHandleParsingHiiGuid                                   ##UNDEFINED\r
 \r
 [Pcd.common]\r
-  gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize     # ALWAYS_CONSUMED\r
-  gEfiShellPkgTokenSpaceGuid.PcdShellPrintBufferSize       # ALWAYS_CONSUMED\r
-  gEfiShellPkgTokenSpaceGuid.PcdShellIncludeNtGuids        # ALWAYS_CONSUMED
\ No newline at end of file
+  gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize    ##CONSUMES\r
+  gEfiShellPkgTokenSpaceGuid.PcdShellPrintBufferSize      ##CONSUMES\r
+  gEfiShellPkgTokenSpaceGuid.PcdShellIncludeNtGuids       ##CONSUMES
\ No newline at end of file

diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni
index 0ce6935b9ccf0be02d88df4157ef7fedb9b482e4..096e6c8f4e6b5472d5aee5c33c6d6563b65368d7 100644 (file)
Binary files a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni and b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni differ