ShellPkg/dh: Add mapping of new UEFI/PI protocols

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Huajing Li <huajing.li@intel.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>

3 files changed, 140 insertions, 0 deletions

diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
index d12466c..06f9d26 100644
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
@@ -2147,6 +2147,37 @@ STATIC CONST GUID_INFO_BLOCK mGuidStringList[] = {
   {STRING_TOKEN(STR_ADAPTER_INFO),          &gEfiAdapterInformationProtocolGuid,              AdapterInformationDumpInformation},

 

 //

+// UEFI2.5

+//

+  {STRING_TOKEN(STR_TLS_SB),                &gEfiTlsServiceBindingProtocolGuid,              NULL},

+  {STRING_TOKEN(STR_TLS),                   &gEfiTlsProtocolGuid,                            NULL},

+  {STRING_TOKEN(STR_TLS_CONFIG),            &gEfiTlsConfigurationProtocolGuid,               NULL},

+  {STRING_TOKEN(STR_SUPPLICANT_SB),         &gEfiSupplicantServiceBindingProtocolGuid,       NULL},

+  {STRING_TOKEN(STR_SUPPLICANT),            &gEfiSupplicantProtocolGuid,                     NULL},

+

+//

+// UEFI2.6

+//

+  {STRING_TOKEN(STR_WIFI2),                 &gEfiWiFi2ProtocolGuid,                          NULL},

+  {STRING_TOKEN(STR_RAMDISK),               &gEfiRamDiskProtocolGuid,                        NULL},

+  {STRING_TOKEN(STR_HII_ID),                &gEfiHiiImageDecoderProtocolGuid,                NULL},

+  {STRING_TOKEN(STR_HII_IE),                &gEfiHiiImageExProtocolGuid,                     NULL},

+  {STRING_TOKEN(STR_SD_MPT),                &gEfiSdMmcPassThruProtocolGuid,                  NULL},

+  {STRING_TOKEN(STR_ERASE_BLOCK),           &gEfiEraseBlockProtocolGuid,                     NULL},

+

+//

+// UEFI2.7

+//

+  {STRING_TOKEN(STR_BLUETOOTH_ATTR),        &gEfiBluetoothAttributeProtocolGuid,               NULL},

+  {STRING_TOKEN(STR_BLUETOOTH_ATTR_SB),     &gEfiBluetoothAttributeServiceBindingProtocolGuid, NULL},

+  {STRING_TOKEN(STR_BLUETOOTH_LE_CONFIG),   &gEfiBluetoothLeConfigProtocolGuid,                NULL},

+  {STRING_TOKEN(STR_UFS_DEV_CONFIG),        &gEfiUfsDeviceConfigProtocolGuid,                  NULL},

+  {STRING_TOKEN(STR_HTTP_BOOT_CALL),        &gEfiHttpBootCallbackProtocolGuid,                 NULL},

+  {STRING_TOKEN(STR_RESET_NOTI),            &gEfiResetNotificationProtocolGuid,                NULL},

+  {STRING_TOKEN(STR_PARTITION_INFO),        &gEfiPartitionInfoProtocolGuid,                    NULL},

+  {STRING_TOKEN(STR_HII_POPUP),             &gEfiHiiPopupProtocolGuid,                         NULL},

+

+//

 // PI Spec ones

 //

   {STRING_TOKEN(STR_IDE_CONT_INIT),         &gEfiIdeControllerInitProtocolGuid,               NULL},

@@ -2271,6 +2302,31 @@ STATIC CONST GUID_INFO_BLOCK mGuidStringList[] = {
   {STRING_TOKEN(STR_REST),                  &gEfiRestProtocolGuid,                            NULL},

 

 //

+// PI 1.5

+//

+  {STRING_TOKEN(STR_MM_EOD),                &gEfiMmEndOfDxeProtocolGuid,                      NULL},

+  {STRING_TOKEN(STR_MM_ITD),                &gEfiMmIoTrapDispatchProtocolGuid,                NULL},

+  {STRING_TOKEN(STR_MM_PBD),                &gEfiMmPowerButtonDispatchProtocolGuid,           NULL},

+  {STRING_TOKEN(STR_MM_SBD),                &gEfiMmStandbyButtonDispatchProtocolGuid,         NULL},

+  {STRING_TOKEN(STR_MM_GD),                 &gEfiMmGpiDispatchProtocolGuid,                   NULL},

+  {STRING_TOKEN(STR_MM_UD),                 &gEfiMmUsbDispatchProtocolGuid,                   NULL},

+  {STRING_TOKEN(STR_MM_PTD),                &gEfiMmPeriodicTimerDispatchProtocolGuid,         NULL},

+  {STRING_TOKEN(STR_MM_SXD),                &gEfiMmSxDispatchProtocolGuid,                    NULL},

+  {STRING_TOKEN(STR_MM_SWD),                &gEfiMmSwDispatchProtocolGuid,                    NULL},

+  {STRING_TOKEN(STR_MM_PRBI),               &gEfiMmPciRootBridgeIoProtocolGuid,               NULL},

+  {STRING_TOKEN(STR_MM_CPU),                &gEfiMmCpuProtocolGuid,                           NULL},

+  {STRING_TOKEN(STR_MM_STACODE),            &gEfiMmStatusCodeProtocolGuid,                    NULL},

+  {STRING_TOKEN(STR_DXEMM_RTL),             &gEfiDxeMmReadyToLockProtocolGuid,                NULL},

+  {STRING_TOKEN(STR_MM_CONFIG),             &gEfiMmConfigurationProtocolGuid,                 NULL},

+  {STRING_TOKEN(STR_MM_RTL),                &gEfiMmReadyToLockProtocolGuid,                   NULL},

+  {STRING_TOKEN(STR_MM_CONTROL),            &gEfiMmControlProtocolGuid,                       NULL},

+  {STRING_TOKEN(STR_MM_ACCESS),             &gEfiMmAccessProtocolGuid,                        NULL},

+  {STRING_TOKEN(STR_MM_BASE),               &gEfiMmBaseProtocolGuid,                          NULL},

+  {STRING_TOKEN(STR_MM_CPUIO),              &gEfiMmCpuIoProtocolGuid,                         NULL},

+  {STRING_TOKEN(STR_MM_RH),                 &gEfiMmRscHandlerProtocolGuid,                    NULL},

+  {STRING_TOKEN(STR_MM_COM),                &gEfiMmCommunicationProtocolGuid,                 NULL},

+

+//

 // UEFI Shell Spec 2.0

 //

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

diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
index 4c1c3d3..1ab208e 100644
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
@@ -292,6 +292,46 @@
   gEfiHttpProtocolGuid                                    ## UNDEFINED

   gEfiHttpUtilitiesProtocolGuid                           ## UNDEFINED

   gEfiRestProtocolGuid                                    ## UNDEFINED

+  gEfiMmEndOfDxeProtocolGuid                              ## UNDEFINED

+  gEfiMmIoTrapDispatchProtocolGuid                        ## UNDEFINED

+  gEfiMmPowerButtonDispatchProtocolGuid                   ## UNDEFINED

+  gEfiMmStandbyButtonDispatchProtocolGuid                 ## UNDEFINED

+  gEfiMmGpiDispatchProtocolGuid                           ## UNDEFINED

+  gEfiMmUsbDispatchProtocolGuid                           ## UNDEFINED

+  gEfiMmPeriodicTimerDispatchProtocolGuid                 ## UNDEFINED

+  gEfiMmSxDispatchProtocolGuid                            ## UNDEFINED

+  gEfiMmSwDispatchProtocolGuid                            ## UNDEFINED

+  gEfiMmPciRootBridgeIoProtocolGuid                       ## UNDEFINED

+  gEfiMmCpuProtocolGuid                                   ## UNDEFINED

+  gEfiMmStatusCodeProtocolGuid                            ## UNDEFINED

+  gEfiDxeMmReadyToLockProtocolGuid                        ## UNDEFINED

+  gEfiMmConfigurationProtocolGuid                         ## UNDEFINED

+  gEfiMmReadyToLockProtocolGuid                           ## UNDEFINED

+  gEfiMmControlProtocolGuid                               ## UNDEFINED

+  gEfiMmAccessProtocolGuid                                ## UNDEFINED

+  gEfiMmBaseProtocolGuid                                  ## UNDEFINED

+  gEfiMmCpuIoProtocolGuid                                 ## UNDEFINED

+  gEfiMmRscHandlerProtocolGuid                            ## UNDEFINED

+  gEfiMmCommunicationProtocolGuid                         ## UNDEFINED

+  gEfiTlsServiceBindingProtocolGuid                       ## UNDEFINED

+  gEfiTlsProtocolGuid                                     ## UNDEFINED

+  gEfiTlsConfigurationProtocolGuid                        ## UNDEFINED

+  gEfiSupplicantServiceBindingProtocolGuid                ## UNDEFINED

+  gEfiSupplicantProtocolGuid                              ## UNDEFINED

+  gEfiWiFi2ProtocolGuid                                   ## UNDEFINED

+  gEfiRamDiskProtocolGuid                                 ## UNDEFINED

+  gEfiHiiImageDecoderProtocolGuid                         ## UNDEFINED

+  gEfiHiiImageExProtocolGuid                              ## UNDEFINED

+  gEfiSdMmcPassThruProtocolGuid                           ## UNDEFINED

+  gEfiEraseBlockProtocolGuid                              ## UNDEFINED

+  gEfiBluetoothAttributeProtocolGuid                      ## UNDEFINED

+  gEfiBluetoothAttributeServiceBindingProtocolGuid        ## UNDEFINED

+  gEfiBluetoothLeConfigProtocolGuid                       ## UNDEFINED

+  gEfiUfsDeviceConfigProtocolGuid                         ## UNDEFINED

+  gEfiHttpBootCallbackProtocolGuid                        ## UNDEFINED

+  gEfiResetNotificationProtocolGuid                       ## UNDEFINED

+  gEfiPartitionInfoProtocolGuid                           ## UNDEFINED

+  gEfiHiiPopupProtocolGuid                                ## UNDEFINED

 

 [Guids]

   gEfiFileInfoGuid                                        ## UNDEFINED

diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni
index f49ca94..d5e0c79 100644
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni
@@ -333,6 +333,50 @@
 #string STR_NET_HTTP_U            #language en-US "HttpUtilities"

 #string STR_REST                  #language en-US "Rest"

 

+#string STR_MM_EOD                #language en-US "MmEndOfDxe"

+#string STR_MM_ITD                #language en-US "MmIoTrapDispatch"

+#string STR_MM_PBD                #language en-US "MmPowerButtonDispatch"

+#string STR_MM_SBD                #language en-US "MmStandbyButtonDispatch"

+#string STR_MM_GD                 #language en-US "MmGpiDispatch"

+#string STR_MM_UD                 #language en-US "MmUsbDispatch"

+#string STR_MM_PTD                #language en-US "MmPeriodicTimerDispatch"

+#string STR_MM_SXD                #language en-US "MmSxDispatch"

+#string STR_MM_SWD                #language en-US "MmSwDispatch"

+#string STR_MM_PRBI               #language en-US "MmPciRootBridgeIo"

+#string STR_MM_CPU                #language en-US "MmCpu"

+#string STR_MM_STACODE            #language en-US "MmStatusCode"

+#string STR_DXEMM_RTL             #language en-US "DxeMmReadyToLock"

+#string STR_MM_CONFIG             #language en-US "MmConfiguration"

+#string STR_MM_RTL                #language en-US "MmReadyToLock"

+#string STR_MM_CONTROL            #language en-US "MmControl"

+#string STR_MM_ACCESS             #language en-US "MmAccess"

+#string STR_MM_BASE               #language en-US "MmBase"

+#string STR_MM_CPUIO              #language en-US "MmCpuIo"

+#string STR_MM_RH                 #language en-US "MmRscHandler"

+#string STR_MM_COM                #language en-US "MmCommunication"

+

+#string STR_TLS_SB                #language en-US "TlsServiceBinding"

+#string STR_TLS                   #language en-US "Tls"

+#string STR_TLS_CONFIG            #language en-US "TlsConfiguration"

+#string STR_SUPPLICANT_SB         #language en-US "SupplicantServiceBinding"

+#string STR_SUPPLICANT            #language en-US "Supplicant"

+

+#string STR_WIFI2                 #language en-US "WiFi2"

+#string STR_RAMDISK               #language en-US "RamDisk"

+#string STR_HII_ID                #language en-US "HiiImageDecoder"

+#string STR_HII_IE                #language en-US "HiiImageEx"

+#string STR_SD_MPT                #language en-US "SdMmcPassThru"

+#string STR_ERASE_BLOCK           #language en-US "EraseBlock"

+

+#string STR_BLUETOOTH_ATTR        #language en-US "BluetoothAttribute"

+#string STR_BLUETOOTH_ATTR_SB     #language en-US "BluetoothAttributeServiceBinding"

+#string STR_BLUETOOTH_LE_CONFIG   #language en-US "BluetoothLeConfig"

+#string STR_UFS_DEV_CONFIG        #language en-US "UfsDeviceConfig"

+#string STR_HTTP_BOOT_CALL        #language en-US "HttpBootCallback"

+#string STR_RESET_NOTI            #language en-US "ResetNotification"

+#string STR_PARTITION_INFO        #language en-US "PartitionInfo"

+#string STR_HII_POPUP             #language en-US "HiiPopup"

+

 #string STR_IDE_CONT_INIT         #language en-US "IdeControllerInit"

 #string STR_DISK_INFO             #language en-US "DiskInfo"

 #string STR_BLOCKIO_INFO          #language en-US "  %s%sMId:%%H%x%%N bsize %%H%x%%N, lblock %lx (%,ld), %s %s %s"