ShellPkg/UefiHandleParsingLib: Remove some unused Guids

ExtendedSalBootService.h, ExtendedSalServiceClasses.h and
McaInitPmi.h will be deleted. So remove the Guids defined
in these Protocols. And also remove strings in uni file.
https://bugzilla.tianocore.org/show_bug.cgi?id=1560

Cc: Jaben Carsey <jaben.carsey@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
index 8e8fa13..f179c41 100644 (file)
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
@@ -2315,23 +2315,6 @@ STATIC CONST GUID_INFO_BLOCK mGuidStringList[] = {
   {STRING_TOKEN(STR_FVB2),                  &gEfiFirmwareVolumeBlock2ProtocolGuid,            NULL},\r
   {STRING_TOKEN(STR_CPUIO2),                &gEfiCpuIo2ProtocolGuid,                          NULL},\r
   {STRING_TOKEN(STR_LEGACY_R2),             &gEfiLegacyRegion2ProtocolGuid,                   NULL},\r
-  {STRING_TOKEN(STR_SAL_MIP),               &gEfiSalMcaInitPmiProtocolGuid,                   NULL},\r
-  {STRING_TOKEN(STR_ES_BS),                 &gEfiExtendedSalBootServiceProtocolGuid,          NULL},\r
-  {STRING_TOKEN(STR_ES_BIO),                &gEfiExtendedSalBaseIoServicesProtocolGuid,       NULL},\r
-  {STRING_TOKEN(STR_ES_STALL),              &gEfiExtendedSalStallServicesProtocolGuid,        NULL},\r
-  {STRING_TOKEN(STR_ES_RTC),                &gEfiExtendedSalRtcServicesProtocolGuid,          NULL},\r
-  {STRING_TOKEN(STR_ES_VS),                 &gEfiExtendedSalVariableServicesProtocolGuid,     NULL},\r
-  {STRING_TOKEN(STR_ES_MTC),                &gEfiExtendedSalMtcServicesProtocolGuid,          NULL},\r
-  {STRING_TOKEN(STR_ES_RESET),              &gEfiExtendedSalResetServicesProtocolGuid,        NULL},\r
-  {STRING_TOKEN(STR_ES_SC),                 &gEfiExtendedSalStatusCodeServicesProtocolGuid,   NULL},\r
-  {STRING_TOKEN(STR_ES_FBS),                &gEfiExtendedSalFvBlockServicesProtocolGuid,      NULL},\r
-  {STRING_TOKEN(STR_ES_MP),                 &gEfiExtendedSalMpServicesProtocolGuid,           NULL},\r
-  {STRING_TOKEN(STR_ES_PAL),                &gEfiExtendedSalPalServicesProtocolGuid,          NULL},\r
-  {STRING_TOKEN(STR_ES_BASE),               &gEfiExtendedSalBaseServicesProtocolGuid,         NULL},\r
-  {STRING_TOKEN(STR_ES_MCA),                &gEfiExtendedSalMcaServicesProtocolGuid,          NULL},\r
-  {STRING_TOKEN(STR_ES_PCI),                &gEfiExtendedSalPciServicesProtocolGuid,          NULL},\r
-  {STRING_TOKEN(STR_ES_CACHE),              &gEfiExtendedSalCacheServicesProtocolGuid,        NULL},\r
-  {STRING_TOKEN(STR_ES_MCA_LOG),            &gEfiExtendedSalMcaLogServicesProtocolGuid,       NULL},\r
   {STRING_TOKEN(STR_S2ARCH),                &gEfiSecurity2ArchProtocolGuid,                   NULL},\r
   {STRING_TOKEN(STR_EODXE),                 &gEfiSmmEndOfDxeProtocolGuid,                     NULL},\r
   {STRING_TOKEN(STR_ISAHC),                 &gEfiIsaHcProtocolGuid,                           NULL},\r

diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
index 2a54529..93b69cd 100644 (file)
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
@@ -229,23 +229,6 @@
   gEfiFirmwareVolumeBlock2ProtocolGuid                    ## UNDEFINED\r
   gEfiCpuIo2ProtocolGuid                                  ## UNDEFINED\r
   gEfiLegacyRegion2ProtocolGuid                           ## UNDEFINED\r
-  gEfiSalMcaInitPmiProtocolGuid                           ## UNDEFINED\r
-  gEfiExtendedSalBootServiceProtocolGuid                  ## UNDEFINED\r
-  gEfiExtendedSalBaseIoServicesProtocolGuid               ## UNDEFINED\r
-  gEfiExtendedSalStallServicesProtocolGuid                ## UNDEFINED\r
-  gEfiExtendedSalRtcServicesProtocolGuid                  ## UNDEFINED\r
-  gEfiExtendedSalVariableServicesProtocolGuid             ## UNDEFINED\r
-  gEfiExtendedSalMtcServicesProtocolGuid                  ## UNDEFINED\r
-  gEfiExtendedSalResetServicesProtocolGuid                ## UNDEFINED\r
-  gEfiExtendedSalStatusCodeServicesProtocolGuid           ## UNDEFINED\r
-  gEfiExtendedSalFvBlockServicesProtocolGuid              ## UNDEFINED\r
-  gEfiExtendedSalMpServicesProtocolGuid                   ## UNDEFINED\r
-  gEfiExtendedSalPalServicesProtocolGuid                  ## UNDEFINED\r
-  gEfiExtendedSalBaseServicesProtocolGuid                 ## UNDEFINED\r
-  gEfiExtendedSalMcaServicesProtocolGuid                  ## UNDEFINED\r
-  gEfiExtendedSalPciServicesProtocolGuid                  ## UNDEFINED\r
-  gEfiExtendedSalCacheServicesProtocolGuid                ## UNDEFINED\r
-  gEfiExtendedSalMcaLogServicesProtocolGuid               ## UNDEFINED\r
   gEfiSecurity2ArchProtocolGuid                           ## UNDEFINED\r
   gEfiSmmEndOfDxeProtocolGuid                             ## UNDEFINED\r
   gEfiIsaHcProtocolGuid                                   ## UNDEFINED\r

diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni
index 15a2706..9c8028d 100644 (file)
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni
@@ -268,23 +268,6 @@
 #string STR_FVB2                  #language en-US "FirmwareVolumeBlock2"\r
 #string STR_CPUIO2                #language en-US "CpuIo2"\r
 #string STR_LEGACY_R2             #language en-US "LegacyRegion2"\r
-#string STR_SAL_MIP               #language en-US "SalMcaInitPmi"\r
-#string STR_ES_BS                 #language en-US "ExtendedSalBootService"\r
-#string STR_ES_BIO                #language en-US "ExtendedSalBaseIoServices"\r
-#string STR_ES_STALL              #language en-US "ExtendedSalStallServices"\r
-#string STR_ES_RTC                #language en-US "ExtendedSalRtcServices"\r
-#string STR_ES_VS                 #language en-US "ExtendedSalVariableServices"\r
-#string STR_ES_MTC                #language en-US "ExtendedSalMtcServices"\r
-#string STR_ES_RESET              #language en-US "ExtendedSalResetServices"\r
-#string STR_ES_SC                 #language en-US "ExtendedSalStatusCodeServices"\r
-#string STR_ES_FBS                #language en-US "ExtendedSalFvBlockServices"\r
-#string STR_ES_MP                 #language en-US "ExtendedSalMpServices"\r
-#string STR_ES_PAL                #language en-US "ExtendedSalPalServices"\r
-#string STR_ES_BASE               #language en-US "ExtendedSalBaseServices"\r
-#string STR_ES_MCA                #language en-US "ExtendedSalMcaServices"\r
-#string STR_ES_PCI                #language en-US "ExtendedSalPciServices"\r
-#string STR_ES_CACHE              #language en-US "ExtendedSalCacheServices"\r
-#string STR_ES_MCA_LOG            #language en-US "ExtendedSalMcaLogServices"\r
 #string STR_S2ARCH                #language en-US "Security2Arch"\r
 #string STR_EODXE                 #language en-US "SmmEndOfDxe"\r
 #string STR_ISAHC                 #language en-US "IsaHc"\r