1) Sync EdkCompatibilityPkg with EDK 1.04. The changes includes:

[mirror_edk2.git] / EdkCompatibilityPkg / Foundation / Library / EdkIIGlueLib / Library / BaseTimerLibLocalApic / Ipf / IpfTimerLib.c

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseTimerLibLocalApic/Ipf/IpfTimerLib.c b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseTimerLibLocalApic/Ipf/IpfTimerLib.c
index 524d973c16669473740e35fc9241918a76af6cd6..fb4fb5a9cd72be615141ecd36ae80e2ea7b40acf 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseTimerLibLocalApic/Ipf/IpfTimerLib.c
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseTimerLibLocalApic/Ipf/IpfTimerLib.c
@@ -47,14 +47,14 @@ InternalIpfDelay (
   //\r
   // The target timer count is calculated here\r
   //\r
-  Ticks = IpfReadItc () + Delay;\r
+  Ticks = (INT64)AsmReadItc () + Delay;\r
 \r
   //\r
   // Wait until time out\r
   // Delay > 2^63 could not be handled by this function\r
   // Timer wrap-arounds are handled correctly by this function\r
   //\r
-  while (Ticks - IpfReadItc () >= 0);\r
+  while (Ticks - (INT64)AsmReadItc() >= 0);\r
 }\r
 \r
 /**\r
@@ -123,7 +123,7 @@ GetPerformanceCounter (
   VOID\r
   )\r
 {\r
-  return IpfReadItc ();\r
+  return AsmReadItc ();\r
 }\r
 \r
 /**\r
@@ -156,7 +156,7 @@ GetPerformanceCounterProperties (
   OUT      UINT64                    *EndValue     OPTIONAL\r
   )\r
 {\r
-  PAL_PROC_RETURN                   PalRet;\r
+  PAL_CALL_RETURN                   PalRet;\r
   UINT64                            BaseFrequence;\r
 \r
   PalRet = PalCallStatic (NULL, 13, 0, 0, 0);\r