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

4 files changed, 232 insertions, 113 deletions

diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
index 9e51648217..44ad4c0b55 100644
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
@@ -1,7 +1,7 @@
 /** @file

   Provides interface to advanced shell functionality for parsing both handle and protocol database.

 

-  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2010 - 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

@@ -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;

 STATIC CONST EFI_GUID WinNtSerialPortGuid    = LOCAL_EFI_WIN_NT_SERIAL_PORT_GUID;

 

-STATIC CONST PROTOCOL_INFO_BLOCK mGuidStringListNT[] = {

+STATIC CONST GUID_INFO_BLOCK mGuidStringListNT[] = {

   {STRING_TOKEN(STR_WINNT_THUNK),           (EFI_GUID*)&WinNtThunkProtocolGuid,               NULL},

   {STRING_TOKEN(STR_WINNT_DRIVER_IO),       (EFI_GUID*)&WinNtIoProtocolGuid,                  NULL},

   {STRING_TOKEN(STR_WINNT_SERIAL_PORT),     (EFI_GUID*)&WinNtSerialPortGuid,                  NULL},

   {STRING_TOKEN(STR_UNKNOWN_DEVICE),        NULL,                                             NULL},

 };

 

-STATIC CONST PROTOCOL_INFO_BLOCK mGuidStringList[] = {

+STATIC CONST GUID_INFO_BLOCK mGuidStringList[] = {

   {STRING_TOKEN(STR_LOADED_IMAGE),          &gEfiLoadedImageProtocolGuid,                     NULL},

   {STRING_TOKEN(STR_DEVICE_PATH),           &gEfiDevicePathProtocolGuid,                      DevicePathProtocolDumpInformation},

   {STRING_TOKEN(STR_IMAGE_PATH),            &gEfiLoadedImageDevicePathProtocolGuid,           DevicePathProtocolDumpInformation},

@@ -376,8 +376,6 @@ STATIC CONST PROTOCOL_INFO_BLOCK mGuidStringList[] = {
   {STRING_TOKEN(STR_LOAD_FILE),             &gEfiLoadFileProtocolGuid,                        NULL},

   {STRING_TOKEN(STR_LOAD_FILE2),            &gEfiLoadFile2ProtocolGuid,                       NULL},

   {STRING_TOKEN(STR_SIMPLE_FILE_SYS),       &gEfiSimpleFileSystemProtocolGuid,                NULL},

-  {STRING_TOKEN(STR_FILE_INFO),             &gEfiFileInfoGuid,                                NULL},

-  {STRING_TOKEN(STR_FILE_SYS_INFO),         &gEfiFileSystemInfoGuid,                          NULL},

   {STRING_TOKEN(STR_TAPE_IO),               &gEfiTapeIoProtocolGuid,                          NULL},

   {STRING_TOKEN(STR_DISK_IO),               &gEfiDiskIoProtocolGuid,                          NULL},

   {STRING_TOKEN(STR_BLK_IO),                &gEfiBlockIoProtocolGuid,                         NULL},

@@ -416,7 +414,6 @@ STATIC CONST PROTOCOL_INFO_BLOCK mGuidStringList[] = {
   {STRING_TOKEN(STR_IPV4_CFG),              &gEfiIp4ConfigProtocolGuid,                       NULL},

   {STRING_TOKEN(STR_SHELL_PARAMETERS),      &gEfiShellParametersProtocolGuid,                 NULL},

   {STRING_TOKEN(STR_SHELL),                 &gEfiShellProtocolGuid,                           NULL},

-  {STRING_TOKEN(STR_EFI_GLOBAL_VARIABLE),   &gEfiGlobalVariableGuid,                          NULL},

   {STRING_TOKEN(STR_UDPV4_SB),              &gEfiUdp4ServiceBindingProtocolGuid,              NULL},

   {STRING_TOKEN(STR_UDPV4),                 &gEfiUdp4ProtocolGuid,                            NULL},

   {STRING_TOKEN(STR_MTFTPV4_SB),            &gEfiMtftp4ServiceBindingProtocolGuid,            NULL},

@@ -431,6 +428,14 @@ STATIC CONST PROTOCOL_INFO_BLOCK mGuidStringList[] = {
   {STRING_TOKEN(STR_HII_CONFIG_ROUT),       &gEfiHiiConfigRoutingProtocolGuid,                NULL},

   {STRING_TOKEN(STR_HII_CONFIG_ACC),        &gEfiHiiConfigAccessProtocolGuid,                 NULL},

   {STRING_TOKEN(STR_HII_FORM_BROWSER2),     &gEfiFormBrowser2ProtocolGuid,                    NULL},

+  {STRING_TOKEN(STR_DRIVER_FAM_OVERRIDE),   &gEfiDriverFamilyOverrideProtocolGuid,            NULL},

+  {STRING_TOKEN(STR_PCD),                   &gPcdProtocolGuid,                                NULL},

+  {STRING_TOKEN(STR_TCG),                   &gEfiTcgProtocolGuid,                             NULL},

+  {STRING_TOKEN(STR_HII_PACKAGE_LIST),      &gEfiHiiPackageListProtocolGuid,                  NULL},

+

+//

+// the ones under this are deprecated by the current UEFI Spec, but may be found anyways...

+//

   {STRING_TOKEN(STR_SHELL_INTERFACE),       &gEfiShellInterfaceGuid,                          NULL},

   {STRING_TOKEN(STR_SHELL_ENV2),            &gEfiShellEnvironment2Guid,                       NULL},

   {STRING_TOKEN(STR_SHELL_ENV),             &gEfiShellEnvironment2Guid,                       NULL},

@@ -441,6 +446,62 @@ STATIC CONST PROTOCOL_INFO_BLOCK mGuidStringList[] = {
   {STRING_TOKEN(STR_GPT_NBR),               &gEfiPartTypeLegacyMbrGuid,                       NULL},

   {STRING_TOKEN(STR_DRIVER_CONFIG),         &gEfiDriverConfigurationProtocolGuid,             NULL},

   {STRING_TOKEN(STR_DRIVER_CONFIG2),        &gEfiDriverConfiguration2ProtocolGuid,            NULL},

+

+//

+// the ones under this are GUID identified structs, not protocols

+//

+  {STRING_TOKEN(STR_FILE_INFO),             &gEfiFileInfoGuid,                                NULL},

+  {STRING_TOKEN(STR_FILE_SYS_INFO),         &gEfiFileSystemInfoGuid,                          NULL},

+

+//

+// the ones under this are misc GUIDS.

+//

+  {STRING_TOKEN(STR_EFI_GLOBAL_VARIABLE),   &gEfiGlobalVariableGuid,                          NULL},

+

+//

+// UEFI 2.2

+//

+  {STRING_TOKEN(STR_IP6_SB),                &gEfiIp6ServiceBindingProtocolGuid,               NULL},

+  {STRING_TOKEN(STR_IP6),                   &gEfiIp6ProtocolGuid,                             NULL},

+  {STRING_TOKEN(STR_IP6_CONFIG),            &gEfiIp6ConfigProtocolGuid,                       NULL},

+  {STRING_TOKEN(STR_MTFTP6_SB),             &gEfiMtftp6ServiceBindingProtocolGuid,            NULL},

+  {STRING_TOKEN(STR_MTFTP6),                &gEfiMtftp6ProtocolGuid,                          NULL},

+  {STRING_TOKEN(STR_DHCP6_SB),              &gEfiDhcp6ServiceBindingProtocolGuid,             NULL},

+  {STRING_TOKEN(STR_DHCP6),                 &gEfiDhcp6ProtocolGuid,                           NULL},

+  {STRING_TOKEN(STR_UDP6_SB),               &gEfiUdp6ServiceBindingProtocolGuid,              NULL},

+  {STRING_TOKEN(STR_UDP6),                  &gEfiUdp6ProtocolGuid,                            NULL},

+  {STRING_TOKEN(STR_TCP6_SB),               &gEfiTcp6ServiceBindingProtocolGuid,              NULL},

+  {STRING_TOKEN(STR_TCP6),                  &gEfiTcp6ProtocolGuid,                            NULL},

+  {STRING_TOKEN(STR_VLAN_CONFIG),           &gEfiVlanConfigProtocolGuid,                      NULL},

+  {STRING_TOKEN(STR_EAP),                   &gEfiEapProtocolGuid,                             NULL},

+  {STRING_TOKEN(STR_EAP_MGMT),              &gEfiEapManagementProtocolGuid,                   NULL},

+  {STRING_TOKEN(STR_FTP4_SB),               &gEfiFtp4ServiceBindingProtocolGuid,              NULL},

+  {STRING_TOKEN(STR_FTP4),                  &gEfiFtp4ProtocolGuid,                            NULL},

+  {STRING_TOKEN(STR_IP_SEC_CONFIG),         &gEfiIpSecConfigProtocolGuid,                     NULL},

+  {STRING_TOKEN(STR_DH),                    &gEfiDriverHealthProtocolGuid,                    NULL},

+  {STRING_TOKEN(STR_DEF_IMG_LOAD),          &gEfiDeferredImageLoadProtocolGuid,               NULL},

+  {STRING_TOKEN(STR_USER_CRED),             &gEfiUserCredentialProtocolGuid,                  NULL},

+  {STRING_TOKEN(STR_USER_MNGR),             &gEfiUserManagerProtocolGuid,                     NULL},

+  {STRING_TOKEN(STR_ATA_PASS_THRU),         &gEfiAtaPassThruProtocolGuid,                     NULL},

+

+//

+// UEFI 2.3

+//

+  {STRING_TOKEN(STR_FW_MGMT),               &gEfiFirmwareManagementProtocolGuid,              NULL},

+  {STRING_TOKEN(STR_IP_SEC),                &gEfiIpSecProtocolGuid,                           NULL},

+  {STRING_TOKEN(STR_IP_SEC2),               &gEfiIpSec2ProtocolGuid,                          NULL},

+

+//

+// UEFI 2.3.1

+//

+  {STRING_TOKEN(STR_KMS),                   &gEfiKmsProtocolGuid,                             NULL},

+  {STRING_TOKEN(STR_BLK_IO2),               &gEfiBlockIo2ProtocolGuid,                        NULL},

+  {STRING_TOKEN(STR_SSC),                   &gEfiStorageSecurityCommandProtocolGuid,          NULL},

+  {STRING_TOKEN(STR_UC2),                   &gEfiUserCredential2ProtocolGuid,                 NULL},

+

+//

+// terminator

+//

   {STRING_TOKEN(STR_UNKNOWN_DEVICE),        NULL,                                             NULL},

 };

 

@@ -453,13 +514,13 @@ STATIC CONST PROTOCOL_INFO_BLOCK mGuidStringList[] = {
 

   @return                       The node.

 **/

-CONST PROTOCOL_INFO_BLOCK *

+CONST GUID_INFO_BLOCK *

 EFIAPI

 InternalShellGetNodeFromGuid(

   IN CONST EFI_GUID* Guid

   )

 {

-  CONST PROTOCOL_INFO_BLOCK *ListWalker;

+  CONST GUID_INFO_BLOCK *ListWalker;

 

   ASSERT(Guid != NULL);

 

@@ -496,7 +557,7 @@ GetStringNameFromGuid(
   IN CONST CHAR8    *Lang OPTIONAL

   )

 {

-  CONST PROTOCOL_INFO_BLOCK *Id;

+  CONST GUID_INFO_BLOCK *Id;

 

   Id = InternalShellGetNodeFromGuid(Guid);

   return (HiiGetString(mHandleParsingHiiHandle, Id->StringId, Lang));

@@ -526,7 +587,7 @@ GetProtocolInformationDump(
   IN CONST BOOLEAN    Verbose

   )

 {

-  CONST PROTOCOL_INFO_BLOCK *Id;

+  CONST GUID_INFO_BLOCK *Id;

 

   ASSERT(TheHandle  != NULL);

   ASSERT(Guid       != NULL);

@@ -559,7 +620,7 @@ GetGuidFromStringName(
   IN EFI_GUID     **Guid

   )

 {

-  CONST PROTOCOL_INFO_BLOCK  *ListWalker;

+  CONST GUID_INFO_BLOCK  *ListWalker;

   CHAR16                     *String;

 

   ASSERT(Guid != NULL);

diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h
index 39b2e6535c..3b1ad2bac4 100644
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.h
@@ -1,7 +1,7 @@
 /** @file

   Provides interface to advanced shell functionality for parsing both handle and protocol database.

 

-  Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2011 - 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

@@ -104,6 +104,32 @@
 #include <Protocol/DevicePathUtilities.h>

 //#include <Protocol/FirmwareVolume.h>

 //#include <Protocol/FirmwareVolume2.h>

+#include <Protocol/DriverFamilyOverride.h>

+#include <Protocol/Pcd.h>

+#include <Protocol/TcgService.h>

+#include <Protocol/HiiPackageList.h>

+#include <Protocol/Ip6.h>

+#include <Protocol/Ip6Config.h>

+#include <Protocol/Mtftp6.h>

+#include <Protocol/Dhcp6.h>

+#include <Protocol/Udp6.h>

+#include <Protocol/Tcp6.h>

+#include <Protocol/VlanConfig.h>

+#include <Protocol/Eap.h>

+#include <Protocol/EapManagement.h>

+#include <Protocol/Ftp4.h>

+#include <Protocol/IpSecConfig.h>

+#include <Protocol/DriverHealth.h>

+#include <Protocol/DeferredImageLoad.h>

+#include <Protocol/UserCredential.h>

+#include <Protocol/UserManager.h>

+#include <Protocol/AtaPassThru.h>

+#include <Protocol/FirmwareManagement.h>

+#include <Protocol/IpSec.h>

+#include <Protocol/Kms.h>

+#include <Protocol/BlockIo2.h>

+#include <Protocol/StorageSecurityCommand.h>

+#include <Protocol/UserCredential2.h>

 

 #include <Library/HandleParsingLib.h>

 #include <Library/UefiBootServicesTableLib.h>

@@ -136,12 +162,11 @@ CHAR16 *
   IN CONST BOOLEAN    Verbose

   );

 

-

-typedef struct {

+typedef struct _GUID_INFO_BLOCK{

   EFI_STRING_ID                 StringId;

   EFI_GUID                      *GuidId;

   DUMP_PROTOCOL_INFO            DumpInfo;

-} PROTOCOL_INFO_BLOCK;

+} GUID_INFO_BLOCK;

 

 #endif

 

diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
index 46d918611a..ddba0cfa18 100644
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
@@ -1,6 +1,6 @@
 ##  @file

 #  Provides interface to advanced shell functionality for parsing both handle and protocol database.

-#  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved. <BR>

+#  Copyright (c) 2010 - 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

@@ -49,109 +49,142 @@
   HiiLib

 

 [Protocols]

-  gEfiSimpleFileSystemProtocolGuid              # ALWAYS_CONSUMED

+  gEfiSimpleFileSystemProtocolGuid                        ##CONSUMES

 

   # shell 2.0

-  gEfiShellProtocolGuid                         # SOMETIMES_CONSUMED

-  gEfiShellParametersProtocolGuid               # SOMETIMES_CONSUMED

+  gEfiShellProtocolGuid                                   ##SOMETIMES_CONSUMED

+  gEfiShellParametersProtocolGuid                         ##SOMETIMES_CONSUMED

 

   # 'old' shell

-  gEfiShellEnvironment2Guid                     # SOMETIMES_CONSUMED

-  gEfiShellInterfaceGuid                        # SOMETIMES_CONSUMED

+  gEfiShellEnvironment2Guid                               ##SOMETIMES_CONSUMED

+  gEfiShellInterfaceGuid                                  ##SOMETIMES_CONSUMED

 

-  gEfiUnicodeCollation2ProtocolGuid                       # ALWAYS_CONSUMED

-  gEfiDevicePathToTextProtocolGuid                        # ALWAYS_CONSUMED

-  gEfiBusSpecificDriverOverrideProtocolGuid               # ALWAYS_CONSUMED

-  gEfiDevicePathUtilitiesProtocolGuid                     # ALWAYS_CONSUMED

-  gEfiDevicePathFromTextProtocolGuid                      # ALWAYS_CONSUMED

-  gEfiPlatformDriverOverrideProtocolGuid                  # ALWAYS_CONSUMED

-  gEfiSimpleTextInProtocolGuid                            # ALWAYS_CONSUMED

-  gEfiPlatformToDriverConfigurationProtocolGuid           # ALWAYS_CONSUMED

-  gEfiDriverSupportedEfiVersionProtocolGuid               # ALWAYS_CONSUMED

-  gEfiLoadedImageProtocolGuid                             # ALWAYS_CONSUMED

-  gEfiDevicePathProtocolGuid                              # ALWAYS_CONSUMED

-  gEfiLoadedImageDevicePathProtocolGuid                   # ALWAYS_CONSUMED

-  gEfiSimpleTextOutProtocolGuid

-  gEfiSimplePointerProtocolGuid

-  gEfiAbsolutePointerProtocolGuid

-  gEfiSerialIoProtocolGuid

-  gEfiEdidDiscoveredProtocolGuid

-  gEfiEdidActiveProtocolGuid

-  gEfiEdidOverrideProtocolGuid

-  gEfiLoadFileProtocolGuid

-  gEfiLoadFile2ProtocolGuid

-  gEfiTapeIoProtocolGuid

-  gEfiDiskIoProtocolGuid

-  gEfiBlockIoProtocolGuid

-  gEfiUnicodeCollationProtocolGuid

-  gEfiPciRootBridgeIoProtocolGuid

-  gEfiPciIoProtocolGuid

-  gEfiScsiPassThruProtocolGuid

-  gEfiScsiIoProtocolGuid

-  gEfiExtScsiPassThruProtocolGuid

-  gEfiIScsiInitiatorNameProtocolGuid

-  gEfiUsbIoProtocolGuid

-  gEfiUsbHcProtocolGuid

-  gEfiUsb2HcProtocolGuid

-  gEfiDebugSupportProtocolGuid

-  gEfiDebugPortProtocolGuid

-  gEfiDecompressProtocolGuid

-  gEfiAcpiTableProtocolGuid

-  gEfiEbcProtocolGuid

-  gEfiSimpleNetworkProtocolGuid

-  gEfiNetworkInterfaceIdentifierProtocolGuid

-  gEfiNetworkInterfaceIdentifierProtocolGuid_31

-  gEfiPxeBaseCodeProtocolGuid

-  gEfiPxeBaseCodeCallbackProtocolGuid

-  gEfiBisProtocolGuid

-  gEfiManagedNetworkServiceBindingProtocolGuid

-  gEfiManagedNetworkProtocolGuid

-  gEfiArpServiceBindingProtocolGuid

-  gEfiArpProtocolGuid

-  gEfiDhcp4ServiceBindingProtocolGuid

-  gEfiDhcp4ProtocolGuid

-  gEfiTcp4ServiceBindingProtocolGuid

-  gEfiTcp4ProtocolGuid

-  gEfiIp4ServiceBindingProtocolGuid

-  gEfiIp4ProtocolGuid

-  gEfiIp4ConfigProtocolGuid

-  gEfiUdp4ServiceBindingProtocolGuid

-  gEfiUdp4ProtocolGuid

-  gEfiMtftp4ServiceBindingProtocolGuid

-  gEfiMtftp4ProtocolGuid

-  gEfiAuthenticationInfoProtocolGuid

-  gEfiHashServiceBindingProtocolGuid

-  gEfiHashProtocolGuid

-  gEfiHiiFontProtocolGuid

-  gEfiHiiStringProtocolGuid

-  gEfiHiiImageProtocolGuid

-  gEfiHiiConfigRoutingProtocolGuid

-  gEfiHiiConfigAccessProtocolGuid

-  gEfiFormBrowser2ProtocolGuid

-  gEfiDeviceIoProtocolGuid

-  gEfiUgaDrawProtocolGuid

-  gEfiUgaIoProtocolGuid

-  gEfiDriverConfigurationProtocolGuid

-  gEfiDriverConfiguration2ProtocolGuid

-  gEfiSimpleTextInputExProtocolGuid

+  gEfiUnicodeCollation2ProtocolGuid                       ##CONSUMES

+  gEfiDevicePathToTextProtocolGuid                        ##CONSUMES

+  gEfiBusSpecificDriverOverrideProtocolGuid               ##CONSUMES

+  gEfiDevicePathUtilitiesProtocolGuid                     ##CONSUMES

+  gEfiDevicePathFromTextProtocolGuid                      ##CONSUMES

+  gEfiPlatformDriverOverrideProtocolGuid                  ##CONSUMES

+  gEfiSimpleTextInProtocolGuid                            ##CONSUMES

+  gEfiPlatformToDriverConfigurationProtocolGuid           ##CONSUMES

+  gEfiDriverSupportedEfiVersionProtocolGuid               ##CONSUMES

+  gEfiLoadedImageProtocolGuid                             ##CONSUMES

+  gEfiDevicePathProtocolGuid                              ##CONSUMES

+  gEfiLoadedImageDevicePathProtocolGuid                   ##CONSUMES

+  gEfiSimpleTextOutProtocolGuid                           ##UNDEFINED

+  gEfiSimplePointerProtocolGuid                           ##UNDEFINED

+  gEfiAbsolutePointerProtocolGuid                         ##UNDEFINED

+  gEfiSerialIoProtocolGuid                                ##UNDEFINED

+  gEfiEdidDiscoveredProtocolGuid                          ##UNDEFINED

+  gEfiEdidActiveProtocolGuid                              ##UNDEFINED

+  gEfiEdidOverrideProtocolGuid                            ##UNDEFINED

+  gEfiLoadFileProtocolGuid                                ##UNDEFINED

+  gEfiLoadFile2ProtocolGuid                               ##UNDEFINED

+  gEfiTapeIoProtocolGuid                                  ##UNDEFINED

+  gEfiDiskIoProtocolGuid                                  ##UNDEFINED

+  gEfiBlockIoProtocolGuid                                 ##UNDEFINED

+  gEfiUnicodeCollationProtocolGuid                        ##UNDEFINED

+  gEfiPciRootBridgeIoProtocolGuid                         ##UNDEFINED

+  gEfiPciIoProtocolGuid                                   ##UNDEFINED

+  gEfiScsiPassThruProtocolGuid                            ##UNDEFINED

+  gEfiScsiIoProtocolGuid                                  ##UNDEFINED

+  gEfiExtScsiPassThruProtocolGuid                         ##UNDEFINED

+  gEfiIScsiInitiatorNameProtocolGuid                      ##UNDEFINED

+  gEfiUsbIoProtocolGuid                                   ##UNDEFINED

+  gEfiUsbHcProtocolGuid                                   ##UNDEFINED

+  gEfiUsb2HcProtocolGuid                                  ##UNDEFINED

+  gEfiDebugSupportProtocolGuid                            ##UNDEFINED

+  gEfiDebugPortProtocolGuid                               ##UNDEFINED

+  gEfiDecompressProtocolGuid                              ##UNDEFINED

+  gEfiAcpiTableProtocolGuid                               ##UNDEFINED

+  gEfiEbcProtocolGuid                                     ##UNDEFINED

+  gEfiSimpleNetworkProtocolGuid                           ##UNDEFINED

+  gEfiNetworkInterfaceIdentifierProtocolGuid              ##UNDEFINED

+  gEfiNetworkInterfaceIdentifierProtocolGuid_31           ##UNDEFINED

+  gEfiPxeBaseCodeProtocolGuid                             ##UNDEFINED

+  gEfiPxeBaseCodeCallbackProtocolGuid                     ##UNDEFINED

+  gEfiBisProtocolGuid                                     ##UNDEFINED

+  gEfiManagedNetworkServiceBindingProtocolGuid            ##UNDEFINED

+  gEfiManagedNetworkProtocolGuid                          ##UNDEFINED

+  gEfiArpServiceBindingProtocolGuid                       ##UNDEFINED

+  gEfiArpProtocolGuid                                     ##UNDEFINED

+  gEfiDhcp4ServiceBindingProtocolGuid                     ##UNDEFINED

+  gEfiDhcp4ProtocolGuid                                   ##UNDEFINED

+  gEfiTcp4ServiceBindingProtocolGuid                      ##UNDEFINED

+  gEfiTcp4ProtocolGuid                                    ##UNDEFINED

+  gEfiIp4ServiceBindingProtocolGuid                       ##UNDEFINED

+  gEfiIp4ProtocolGuid                                     ##UNDEFINED

+  gEfiIp4ConfigProtocolGuid                               ##UNDEFINED

+  gEfiUdp4ServiceBindingProtocolGuid                      ##UNDEFINED

+  gEfiUdp4ProtocolGuid                                    ##UNDEFINED

+  gEfiMtftp4ServiceBindingProtocolGuid                    ##UNDEFINED

+  gEfiMtftp4ProtocolGuid                                  ##UNDEFINED

+  gEfiAuthenticationInfoProtocolGuid                      ##UNDEFINED

+  gEfiHashServiceBindingProtocolGuid                      ##UNDEFINED

+  gEfiHashProtocolGuid                                    ##UNDEFINED

+  gEfiHiiFontProtocolGuid                                 ##UNDEFINED

+  gEfiHiiStringProtocolGuid                               ##UNDEFINED

+  gEfiHiiImageProtocolGuid                                ##UNDEFINED

+  gEfiHiiConfigRoutingProtocolGuid                        ##UNDEFINED

+  gEfiHiiConfigAccessProtocolGuid                         ##UNDEFINED

+  gEfiFormBrowser2ProtocolGuid                            ##UNDEFINED

+  gEfiDeviceIoProtocolGuid                                ##UNDEFINED

+  gEfiUgaDrawProtocolGuid                                 ##UNDEFINED

+  gEfiUgaIoProtocolGuid                                   ##UNDEFINED

+  gEfiDriverConfigurationProtocolGuid                     ##UNDEFINED

+  gEfiDriverConfiguration2ProtocolGuid                    ##UNDEFINED

+  gEfiSimpleTextInputExProtocolGuid                       ##UNDEFINED

+  gEfiIp6ServiceBindingProtocolGuid                       ##UNDEFINED

+  gEfiIp6ProtocolGuid                                     ##UNDEFINED

+  gEfiIp6ConfigProtocolGuid                               ##UNDEFINED

+  gEfiMtftp6ServiceBindingProtocolGuid                    ##UNDEFINED

+  gEfiMtftp6ProtocolGuid                                  ##UNDEFINED

+  gEfiDhcp6ServiceBindingProtocolGuid                     ##UNDEFINED

+  gEfiDhcp6ProtocolGuid                                   ##UNDEFINED

+  gEfiUdp6ServiceBindingProtocolGuid                      ##UNDEFINED

+  gEfiUdp6ProtocolGuid                                    ##UNDEFINED

+  gEfiTcp6ServiceBindingProtocolGuid                      ##UNDEFINED

+  gEfiTcp6ProtocolGuid                                    ##UNDEFINED

+  gEfiVlanConfigProtocolGuid                              ##UNDEFINED

+  gEfiEapProtocolGuid                                     ##UNDEFINED

+  gEfiEapManagementProtocolGuid                           ##UNDEFINED

+  gEfiFtp4ServiceBindingProtocolGuid                      ##UNDEFINED

+  gEfiFtp4ProtocolGuid                                    ##UNDEFINED

+  gEfiIpSecConfigProtocolGuid                             ##UNDEFINED

+  gEfiDriverHealthProtocolGuid                            ##UNDEFINED

+  gEfiDeferredImageLoadProtocolGuid                       ##UNDEFINED

+  gEfiUserCredentialProtocolGuid                          ##UNDEFINED

+  gEfiUserManagerProtocolGuid                             ##UNDEFINED

+  gEfiAtaPassThruProtocolGuid                             ##UNDEFINED

+  gEfiFirmwareManagementProtocolGuid                      ##UNDEFINED

+  gEfiIpSecProtocolGuid                                   ##UNDEFINED

+  gEfiIpSec2ProtocolGuid                                  ##UNDEFINED

+  gEfiKmsProtocolGuid                                     ##UNDEFINED

+  gEfiBlockIo2ProtocolGuid                                ##UNDEFINED

+  gEfiStorageSecurityCommandProtocolGuid                  ##UNDEFINED

+  gEfiUserCredential2ProtocolGuid                         ##UNDEFINED

+  gPcdProtocolGuid                                        ##UNDEFINED

+  gEfiTcgProtocolGuid                                     ##UNDEFINED

+  gEfiHiiPackageListProtocolGuid                          ##UNDEFINED

+  gEfiDriverFamilyOverrideProtocolGuid                    ##UNDEFINED

 

 [Guids]

-  gEfiFileInfoGuid                              # ALWAYS_CONSUMED

-  gEfiShellEnvironment2ExtGuid                  # ALWAYS_CONSUMED

-  gEfiPcAnsiGuid

-  gEfiVT100Guid

-  gEfiVT100PlusGuid

-  gEfiVTUTF8Guid

-  gEfiStandardErrorDeviceGuid

-  gEfiConsoleInDeviceGuid

-  gEfiConsoleOutDeviceGuid

-  gEfiFileSystemInfoGuid

-  gEfiGlobalVariableGuid

-  gEfiPartTypeSystemPartGuid

-  gEfiPartTypeLegacyMbrGuid

-  gHandleParsingHiiGuid

+  gEfiFileInfoGuid                                        ##CONSUMES

+  gEfiShellEnvironment2ExtGuid                            ##CONSUMES

+  gEfiPcAnsiGuid                                          ##UNDEFINED

+  gEfiVT100Guid                                           ##UNDEFINED

+  gEfiVT100PlusGuid                                       ##UNDEFINED

+  gEfiVTUTF8Guid                                          ##UNDEFINED

+  gEfiStandardErrorDeviceGuid                             ##UNDEFINED

+  gEfiConsoleInDeviceGuid                                 ##UNDEFINED

+  gEfiConsoleOutDeviceGuid                                ##UNDEFINED

+  gEfiFileSystemInfoGuid                                  ##UNDEFINED

+  gEfiGlobalVariableGuid                                  ##UNDEFINED

+  gEfiPartTypeSystemPartGuid                              ##UNDEFINED

+  gEfiPartTypeLegacyMbrGuid                               ##UNDEFINED

+  gHandleParsingHiiGuid                                   ##UNDEFINED

 

 [Pcd.common]

-  gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize     # ALWAYS_CONSUMED

-  gEfiShellPkgTokenSpaceGuid.PcdShellPrintBufferSize       # ALWAYS_CONSUMED

-  gEfiShellPkgTokenSpaceGuid.PcdShellIncludeNtGuids        # ALWAYS_CONSUMED
\ No newline at end of file
+  gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize    ##CONSUMES

+  gEfiShellPkgTokenSpaceGuid.PcdShellPrintBufferSize      ##CONSUMES

+  gEfiShellPkgTokenSpaceGuid.PcdShellIncludeNtGuids       ##CONSUMES
\ No newline at end of file
diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni
index 0ce6935b9c..096e6c8f4e 100644
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni