In before, FixedPcdGetxx macro was defined as global variable, it is wrong. It should...

[mirror_edk2.git] / MdePkg / Library / BaseLib / String.c

diff --git a/MdePkg/Library/BaseLib/String.c b/MdePkg/Library/BaseLib/String.c
index 86828e65fc2af52d4619c2d261311d2f2e242874..c4330fa5d209b58c2b4751d9887e547e2e100bf4 100644 (file)
--- a/MdePkg/Library/BaseLib/String.c
+++ b/MdePkg/Library/BaseLib/String.c
@@ -155,8 +155,8 @@ StrLen (
     // If PcdMaximumUnicodeStringLength is not zero,\r
     // length should not more than PcdMaximumUnicodeStringLength\r
     //\r
-    if (FixedPcdGet32 (PcdMaximumUnicodeStringLength) != 0) {\r
-      ASSERT (Length < FixedPcdGet32 (PcdMaximumUnicodeStringLength));\r
+    if (PcdGet32 (PcdMaximumUnicodeStringLength) != 0) {\r
+      ASSERT (Length < PcdGet32 (PcdMaximumUnicodeStringLength));\r
     }\r
   }\r
   return Length;\r
@@ -277,7 +277,7 @@ StrnCmp (
   ASSERT (StrSize (SecondString) != 0);\r
 \r
   while ((*FirstString != L'\0') &&\r
-         (*FirstString != *SecondString) &&\r
+         (*FirstString == *SecondString) &&\r
          (Length > 1)) {\r
     FirstString++;\r
     SecondString++;\r
@@ -520,8 +520,8 @@ AsciiStrLen (
     // If PcdMaximumUnicodeStringLength is not zero,\r
     // length should not more than PcdMaximumUnicodeStringLength\r
     //\r
-    if (FixedPcdGet32 (PcdMaximumAsciiStringLength) != 0) {\r
-      ASSERT (Length < FixedPcdGet32 (PcdMaximumAsciiStringLength));\r
+    if (PcdGet32 (PcdMaximumAsciiStringLength) != 0) {\r
+      ASSERT (Length < PcdGet32 (PcdMaximumAsciiStringLength));\r
     }\r
   }\r
   return Length;\r
@@ -696,7 +696,7 @@ AsciiStrnCmp (
   ASSERT (AsciiStrSize (SecondString));\r
 \r
   while ((*FirstString != '\0') &&\r
-         (*FirstString != *SecondString) &&\r
+         (*FirstString == *SecondString) &&\r
          (Length > 1)) {\r
     FirstString++;\r
     SecondString++;\r
@@ -796,3 +796,51 @@ AsciiStrnCat (
   ASSERT (AsciiStrSize (Destination) != 0);\r
   return Destination;\r
 }\r
+\r
+/**\r
+  Converts an 8-bit value to an 8-bit BCD value.\r
+\r
+  Converts the 8-bit value specified by Value to BCD. The BCD value is\r
+  returned.\r
+\r
+  If Value >= 100, then ASSERT().\r
+\r
+  @param  Value The 8-bit value to convert to BCD. Range 0..99.\r
+\r
+  @return The BCD value\r
+\r
+**/\r
+UINT8\r
+EFIAPI\r
+DecimalToBcd8 (\r
+  IN      UINT8                     Value\r
+  )\r
+{\r
+  ASSERT (Value < 100);\r
+  return ((Value / 10) << 4) | (Value % 10);\r
+}\r
+\r
+/**\r
+  Converts an 8-bit BCD value to an 8-bit value.\r
+\r
+  Converts the 8-bit BCD value specified by Value to an 8-bit value. The 8-bit\r
+  value is returned.\r
+\r
+  If Value >= 0xA0, then ASSERT().\r
+  If (Value & 0x0F) >= 0x0A, then ASSERT().\r
+\r
+  @param  Value The 8-bit BCD value to convert to an 8-bit value.\r
+\r
+  @return The 8-bit value is returned.\r
+\r
+**/\r
+UINT8\r
+EFIAPI\r
+BcdToDecimal8 (\r
+  IN      UINT8                     Value\r
+  )\r
+{\r
+  ASSERT (Value < 0xa0);\r
+  ASSERT ((Value & 0xf) < 0xa);\r
+  return (Value >> 4) * 10 + (Value & 0xf);\r
+}\r