UefiCpuPkg/MtrrLib: Add MtrrLib prefix to several internal functions

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Jeff Fan <jeff.fan@intel.com>

diff --git a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c b/UefiCpuPkg/Library/MtrrLib/MtrrLib.c
index 624be8730e9634f847a6c115c0a0f957a24fc53f..2679725a179340df49b9e9c2b7f62e8725ad33aa 100644 (file)
--- a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c
+++ b/UefiCpuPkg/Library/MtrrLib/MtrrLib.c
@@ -243,7 +243,7 @@ MtrrGetDefaultMemoryType (
 \r
 **/\r
 VOID\r
-PreMtrrChange (\r
+MtrrLibPreMtrrChange (\r
   OUT MTRR_CONTEXT  *MtrrContext\r
   )\r
 {\r
@@ -284,7 +284,7 @@ PreMtrrChange (
 \r
 **/\r
 VOID\r
-PostMtrrChangeEnableCache (\r
+MtrrLibPostMtrrChangeEnableCache (\r
   IN MTRR_CONTEXT  *MtrrContext\r
   )\r
 {\r
@@ -319,7 +319,7 @@ PostMtrrChangeEnableCache (
 \r
 **/\r
 VOID\r
-PostMtrrChange (\r
+MtrrLibPostMtrrChange (\r
   IN MTRR_CONTEXT  *MtrrContext\r
   )\r
 {\r
@@ -328,7 +328,7 @@ PostMtrrChange (
   //\r
   AsmMsrBitFieldWrite64 (MTRR_LIB_IA32_MTRR_DEF_TYPE, 10, 11, 3);\r
 \r
-  PostMtrrChangeEnableCache (MtrrContext);\r
+  MtrrLibPostMtrrChangeEnableCache (MtrrContext);\r
 }\r
 \r
 /**\r
@@ -1086,7 +1086,7 @@ MtrrLibInitializeMtrrMask (
 \r
 **/\r
 UINT64\r
-MtrrPrecedence (\r
+MtrrLibPrecedence (\r
   IN UINT64    MtrrType1,\r
   IN UINT64    MtrrType2\r
   )\r
@@ -1245,7 +1245,7 @@ MtrrGetMemoryAttributeByAddressWorker (
       if (Address >= VariableMtrr[Index].BaseAddress &&\r
           Address < VariableMtrr[Index].BaseAddress+VariableMtrr[Index].Length) {\r
         TempMtrrType = VariableMtrr[Index].Type;\r
-        MtrrType = MtrrPrecedence (MtrrType, TempMtrrType);\r
+        MtrrType = MtrrLibPrecedence (MtrrType, TempMtrrType);\r
       }\r
     }\r
   }\r
@@ -1791,7 +1791,7 @@ Done:
   for (Index = 0; Index < MTRR_NUMBER_OF_FIXED_MTRR; Index++) {\r
     if (FixedSettingsModified[Index]) {\r
       if (!MtrrContextValid) {\r
-        PreMtrrChange (&MtrrContext);\r
+        MtrrLibPreMtrrChange (&MtrrContext);\r
         MtrrContextValid = TRUE;\r
       }\r
       AsmWriteMsr64 (\r
@@ -1809,7 +1809,7 @@ Done:
       if (WorkingVariableSettings.Mtrr[Index].Base != OriginalVariableSettings.Mtrr[Index].Base ||\r
           WorkingVariableSettings.Mtrr[Index].Mask != OriginalVariableSettings.Mtrr[Index].Mask    ) {\r
         if (!MtrrContextValid) {\r
-          PreMtrrChange (&MtrrContext);\r
+          MtrrLibPreMtrrChange (&MtrrContext);\r
           MtrrContextValid = TRUE;\r
         }\r
         AsmWriteMsr64 (\r
@@ -1824,7 +1824,7 @@ Done:
     }\r
   }\r
   if (MtrrContextValid) {\r
-    PostMtrrChange (&MtrrContext);\r
+    MtrrLibPostMtrrChange (&MtrrContext);\r
   }\r
 \r
   DEBUG((DEBUG_CACHE, "  Status = %r\n", Status));\r
@@ -1971,9 +1971,9 @@ MtrrSetVariableMtrr (
     return VariableSettings;\r
   }\r
 \r
-  PreMtrrChange (&MtrrContext);\r
+  MtrrLibPreMtrrChange (&MtrrContext);\r
   MtrrSetVariableMtrrWorker (VariableSettings);\r
-  PostMtrrChange (&MtrrContext);\r
+  MtrrLibPostMtrrChange (&MtrrContext);\r
   MtrrDebugPrintAllMtrrs ();\r
 \r
   return  VariableSettings;\r
@@ -2021,9 +2021,9 @@ MtrrSetFixedMtrr (
     return FixedSettings;\r
   }\r
 \r
-  PreMtrrChange (&MtrrContext);\r
+  MtrrLibPreMtrrChange (&MtrrContext);\r
   MtrrSetFixedMtrrWorker (FixedSettings);\r
-  PostMtrrChange (&MtrrContext);\r
+  MtrrLibPostMtrrChange (&MtrrContext);\r
   MtrrDebugPrintAllMtrrs ();\r
 \r
   return FixedSettings;\r
@@ -2091,7 +2091,7 @@ MtrrSetAllMtrrs (
     return MtrrSetting;\r
   }\r
 \r
-  PreMtrrChange (&MtrrContext);\r
+  MtrrLibPreMtrrChange (&MtrrContext);\r
 \r
   //\r
   // Set fixed MTRRs\r
@@ -2108,7 +2108,7 @@ MtrrSetAllMtrrs (
   //\r
   AsmWriteMsr64 (MTRR_LIB_IA32_MTRR_DEF_TYPE, MtrrSetting->MtrrDefType);\r
 \r
-  PostMtrrChangeEnableCache (&MtrrContext);\r
+  MtrrLibPostMtrrChangeEnableCache (&MtrrContext);\r
 \r
   return MtrrSetting;\r
 }\r