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 <jordan.l.justen@intel.com>
Acked-by: Mark Doran <mark.doran@intel.com>
Acked-by: Laszlo Ersek <lersek@redhat.com>

2 files changed, 10 insertions, 23 deletions

diff --git a/FatPkg/EnhancedFatDxe/Fat.inf b/FatPkg/EnhancedFatDxe/Fat.inf
index cf2bfe8..1c2b08f 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 e0b7e0d..5427f67 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,