gEfiFatPkgTokenSpaceGuid.PcdUnicodeCollationSupport and gEfiFatPkgTokenSpaceGuid...

[mirror_edk2.git] / FatPkg / EnhancedFatDxe / UnicodeCollation.c

diff --git a/FatPkg/EnhancedFatDxe/UnicodeCollation.c b/FatPkg/EnhancedFatDxe/UnicodeCollation.c
index e0b7e0d6f030d0ab26c8197d6bf2c45340102f23..5427f6701d1259aeb70b1f74f5a76ee5a87d0a1a 100644 (file)
--- a/FatPkg/EnhancedFatDxe/UnicodeCollation.c
+++ b/FatPkg/EnhancedFatDxe/UnicodeCollation.c
@@ -20,11 +20,8 @@ EFI_UNICODE_COLLATION_PROTOCOL  *mUnicodeCollationInterface = NULL;
 /**\r
   Worker function to initialize Unicode Collation support.\r
 \r
-  This function searches Initialized Unicode Collation support based on PCDs:\r
-  PcdUnicodeCollation2Support and PcdUnicodeCollationSupport.\r
-  It first tries to locate Unicode Collation 2 protocol and matches it with current\r
-  platform language code. If for any reason the first attempt fails, it then tries to\r
-  use Unicode Collation Protocol.\r
+  It tries to locate Unicode Collation (2) protocol and matches it with current\r
+  platform language code.\r
 \r
   @param  AgentHandle          The handle used to open Unicode Collation (2) protocol.\r
   @param  ProtocolGuid         The pointer to Unicode Collation (2) protocol GUID.\r
@@ -114,9 +111,7 @@ InitializeUnicodeCollationSupportWorker (
 /**\r
   Initialize Unicode Collation support.\r
 \r
-  This function searches Initialized Unicode Collation support based on PCDs:\r
-  PcdUnicodeCollation2Support and PcdUnicodeCollationSupport.\r
-  It first tries to locate Unicode Collation 2 protocol and matches it with current\r
+  It tries to locate Unicode Collation 2 protocol and matches it with current\r
   platform language code. If for any reason the first attempt fails, it then tries to\r
   use Unicode Collation Protocol.\r
 \r
@@ -139,20 +134,17 @@ InitializeUnicodeCollationSupport (
   //\r
   // First try to use RFC 4646 Unicode Collation 2 Protocol.\r
   //\r
-  if (FeaturePcdGet (PcdUnicodeCollation2Support)) {\r
-    Status = InitializeUnicodeCollationSupportWorker (\r
-               AgentHandle,\r
-               &gEfiUnicodeCollation2ProtocolGuid,\r
-               L"PlatformLang",\r
-               (CONST CHAR8 *) PcdGetPtr (PcdUefiVariableDefaultPlatformLang)\r
-               );\r
-  }\r
-\r
+  Status = InitializeUnicodeCollationSupportWorker (\r
+             AgentHandle,\r
+             &gEfiUnicodeCollation2ProtocolGuid,\r
+             L"PlatformLang",\r
+             (CONST CHAR8 *) PcdGetPtr (PcdUefiVariableDefaultPlatformLang)\r
+             );\r
   //\r
   // If the attempt to use Unicode Collation 2 Protocol fails, then we fall back\r
   // on the ISO 639-2 Unicode Collation Protocol.\r
   //\r
-  if (FeaturePcdGet (PcdUnicodeCollationSupport) && EFI_ERROR (Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     Status = InitializeUnicodeCollationSupportWorker (\r
                AgentHandle,\r
                &gEfiUnicodeCollationProtocolGuid,\r