From 5779282da553858c4e8ce289217a9e5f0cb18b40 Mon Sep 17 00:00:00 2001 From: Qing Huang Date: Wed, 8 Apr 2009 07:36:44 +0000 Subject: [PATCH] gEfiFatPkgTokenSpaceGuid.PcdUnicodeCollationSupport and gEfiFatPkgTokenSpaceGuid.PcdUnicodeCollationSupport (based on FatPkg commit d865610b1f37a1ab84982151c1b1255cd51d1489) [jordan.l.justen@intel.com: Use script to relicense to 2-clause BSD] Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jordan Justen Acked-by: Mark Doran Acked-by: Laszlo Ersek --- FatPkg/EnhancedFatDxe/Fat.inf | 5 ----- FatPkg/EnhancedFatDxe/UnicodeCollation.c | 28 +++++++++--------------- FatPkg/FatPkg.dec | 8 ------- 3 files changed, 10 insertions(+), 31 deletions(-) diff --git a/FatPkg/EnhancedFatDxe/Fat.inf b/FatPkg/EnhancedFatDxe/Fat.inf index cf2bfe8935..1c2b08fc08 100644 --- a/FatPkg/EnhancedFatDxe/Fat.inf +++ b/FatPkg/EnhancedFatDxe/Fat.inf @@ -63,7 +63,6 @@ [Packages] MdePkg/MdePkg.dec - FatPkg/FatPkg.dec [LibraryClasses] UefiRuntimeServicesTableLib @@ -88,10 +87,6 @@ gEfiUnicodeCollationProtocolGuid gEfiUnicodeCollation2ProtocolGuid -[FeaturePcd] - gEfiFatPkgTokenSpaceGuid.PcdUnicodeCollationSupport - gEfiFatPkgTokenSpaceGuid.PcdUnicodeCollation2Support - [Pcd] gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLang gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang diff --git a/FatPkg/EnhancedFatDxe/UnicodeCollation.c b/FatPkg/EnhancedFatDxe/UnicodeCollation.c index e0b7e0d6f0..5427f6701d 100644 --- a/FatPkg/EnhancedFatDxe/UnicodeCollation.c +++ b/FatPkg/EnhancedFatDxe/UnicodeCollation.c @@ -20,11 +20,8 @@ EFI_UNICODE_COLLATION_PROTOCOL *mUnicodeCollationInterface = NULL; /** Worker function to initialize Unicode Collation support. - This function searches Initialized Unicode Collation support based on PCDs: - PcdUnicodeCollation2Support and PcdUnicodeCollationSupport. - It first tries to locate Unicode Collation 2 protocol and matches it with current - platform language code. If for any reason the first attempt fails, it then tries to - use Unicode Collation Protocol. + It tries to locate Unicode Collation (2) protocol and matches it with current + platform language code. @param AgentHandle The handle used to open Unicode Collation (2) protocol. @param ProtocolGuid The pointer to Unicode Collation (2) protocol GUID. @@ -114,9 +111,7 @@ InitializeUnicodeCollationSupportWorker ( /** Initialize Unicode Collation support. - This function searches Initialized Unicode Collation support based on PCDs: - PcdUnicodeCollation2Support and PcdUnicodeCollationSupport. - It first tries to locate Unicode Collation 2 protocol and matches it with current + It tries to locate Unicode Collation 2 protocol and matches it with current platform language code. If for any reason the first attempt fails, it then tries to use Unicode Collation Protocol. @@ -139,20 +134,17 @@ InitializeUnicodeCollationSupport ( // // First try to use RFC 4646 Unicode Collation 2 Protocol. // - if (FeaturePcdGet (PcdUnicodeCollation2Support)) { - Status = InitializeUnicodeCollationSupportWorker ( - AgentHandle, - &gEfiUnicodeCollation2ProtocolGuid, - L"PlatformLang", - (CONST CHAR8 *) PcdGetPtr (PcdUefiVariableDefaultPlatformLang) - ); - } - + Status = InitializeUnicodeCollationSupportWorker ( + AgentHandle, + &gEfiUnicodeCollation2ProtocolGuid, + L"PlatformLang", + (CONST CHAR8 *) PcdGetPtr (PcdUefiVariableDefaultPlatformLang) + ); // // If the attempt to use Unicode Collation 2 Protocol fails, then we fall back // on the ISO 639-2 Unicode Collation Protocol. // - if (FeaturePcdGet (PcdUnicodeCollationSupport) && EFI_ERROR (Status)) { + if (EFI_ERROR (Status)) { Status = InitializeUnicodeCollationSupportWorker ( AgentHandle, &gEfiUnicodeCollationProtocolGuid, diff --git a/FatPkg/FatPkg.dec b/FatPkg/FatPkg.dec index 9d0b0b68ad..0e1d10f1f4 100644 --- a/FatPkg/FatPkg.dec +++ b/FatPkg/FatPkg.dec @@ -19,11 +19,3 @@ DEC_VERSION = 0x00010005 PACKAGE_NAME = FatPkg PACKAGE_GUID = 8EA68A2C-99CB-4332-85C6-DD5864EAA674 - -[PcdsFeatureFlag.common] - gEfiFatPkgTokenSpaceGuid.PcdUnicodeCollationSupport|TRUE|BOOLEAN|0x00010001 - gEfiFatPkgTokenSpaceGuid.PcdUnicodeCollation2Support|TRUE|BOOLEAN|0x00010002 - -[Guids.common] - gEfiFatPkgTokenSpaceGuid = {0xc8e92dba, 0x1d92, 0x411f, {0xae, 0xa, 0x1d, 0xbe, 0xd8, 0xf1, 0x32, 0x99}} - -- 2.39.2