Sync all bug fixes between EDK1.04 and EDK1.06 into EdkCompatibilityPkg.

[mirror_edk2.git] / EdkCompatibilityPkg / Foundation / Library / EdkIIGlueLib / Library / EdkDxeRuntimeDriverLib / Ipf / RuntimeService.c

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/EdkDxeRuntimeDriverLib/Ipf/RuntimeService.c b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/EdkDxeRuntimeDriverLib/Ipf/RuntimeService.c
index d4010b264b9112f8ac49fa40d0aaea69ad8a0e60..a270fc5508e3953d790fa39d056e8b5bf1b0869f 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/EdkDxeRuntimeDriverLib/Ipf/RuntimeService.c
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/EdkDxeRuntimeDriverLib/Ipf/RuntimeService.c
@@ -1,7 +1,7 @@
 /*++\r
 \r
-Copyright (c) 2004 - 2006, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \r
+Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
 http://opensource.org/licenses/bsd-license.php                                            \r
@@ -20,7 +20,7 @@ Abstract:
 \r
 --*/\r
 \r
-#include "..\RuntimeLibInternal.h"\r
+#include "../RuntimeLibInternal.h"\r
 \r
 VOID\r
 EFIAPI\r
@@ -50,7 +50,10 @@ Returns:
 \r
 --*/\r
 {\r
-  EFI_GUID Guid = EFI_EXTENDED_SAL_RESET_SERVICES_PROTOCOL_GUID;\r
+  EFI_GUID Guid;\r
+\r
+  *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_RESET_SERVICES_PROTOCOL_GUID_LO;\r
+  *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_RESET_SERVICES_PROTOCOL_GUID_HI;\r
 \r
   EfiCallEsalService (\r
     &Guid,\r
@@ -67,7 +70,7 @@ Returns:
 \r
 \r
 //\r
-// The following functions hide the mRT local global from the call to\r
+// The following functions hide the mRTEdkDxeRuntimeDriverLib local global from the call to\r
 // runtime service in the EFI system table.\r
 //\r
 EFI_STATUS\r
@@ -96,7 +99,10 @@ Returns:
 --*/\r
 {\r
   SAL_RETURN_REGS ReturnReg;\r
-  EFI_GUID        Guid = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID;\r
+  EFI_GUID        Guid;\r
+\r
+  *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID_LO;\r
+  *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID_HI;\r
 \r
   ReturnReg = EfiCallEsalService (&Guid, GetTime, (UINT64) Time, (UINT64) Capabilities, 0, 0, 0, 0, 0);\r
   return ReturnReg.Status;\r
@@ -124,7 +130,10 @@ Returns:
 --*/\r
 {\r
   SAL_RETURN_REGS ReturnReg;\r
-  EFI_GUID        Guid = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID;\r
+  EFI_GUID        Guid;\r
+\r
+  *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID_LO;\r
+  *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID_HI;\r
 \r
   ReturnReg = EfiCallEsalService (&Guid, SetTime, (UINT64) Time, 0, 0, 0, 0, 0, 0);\r
   return ReturnReg.Status;\r
@@ -156,7 +165,10 @@ Returns:
 --*/\r
 {\r
   SAL_RETURN_REGS ReturnReg;\r
-  EFI_GUID        Guid = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID;\r
+  EFI_GUID        Guid;\r
+\r
+  *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID_LO;\r
+  *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID_HI;\r
 \r
   ReturnReg = EfiCallEsalService (&Guid, GetWakeupTime, (UINT64) Enabled, (UINT64) Pending, (UINT64) Time, 0, 0, 0, 0);\r
   return ReturnReg.Status;\r
@@ -187,7 +199,10 @@ Returns:
 --*/\r
 {\r
   SAL_RETURN_REGS ReturnReg;\r
-  EFI_GUID        Guid = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID;\r
+  EFI_GUID        Guid;\r
+\r
+  *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID_LO;\r
+  *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID_HI;\r
 \r
   ReturnReg = EfiCallEsalService (&Guid, SetWakeupTime, (UINT64) Enable, (UINT64) Time, 0, 0, 0, 0, 0);\r
   return ReturnReg.Status;\r
@@ -226,7 +241,10 @@ Returns:
 --*/\r
 {\r
   SAL_RETURN_REGS ReturnReg;\r
-  EFI_GUID        Guid = EFI_EXTENDED_SAL_VARIABLE_SERVICES_PROTOCOL_GUID;\r
+  EFI_GUID        Guid;\r
+\r
+  *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_VARIABLE_SERVICES_PROTOCOL_GUID_LO;\r
+  *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_VARIABLE_SERVICES_PROTOCOL_GUID_HI;\r
 \r
   ReturnReg = EfiCallEsalService (\r
                 &Guid,\r
@@ -273,7 +291,10 @@ Returns:
 --*/\r
 {\r
   SAL_RETURN_REGS ReturnReg;\r
-  EFI_GUID        Guid = EFI_EXTENDED_SAL_VARIABLE_SERVICES_PROTOCOL_GUID;\r
+  EFI_GUID        Guid;\r
+\r
+  *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_VARIABLE_SERVICES_PROTOCOL_GUID_LO;\r
+  *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_VARIABLE_SERVICES_PROTOCOL_GUID_HI;\r
 \r
   ReturnReg = EfiCallEsalService (\r
                 &Guid,\r
@@ -320,7 +341,10 @@ Returns:
 --*/\r
 {\r
   SAL_RETURN_REGS ReturnReg;\r
-  EFI_GUID        Guid = EFI_EXTENDED_SAL_VARIABLE_SERVICES_PROTOCOL_GUID;\r
+  EFI_GUID        Guid;\r
+\r
+  *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_VARIABLE_SERVICES_PROTOCOL_GUID_LO;\r
+  *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_VARIABLE_SERVICES_PROTOCOL_GUID_HI;\r
 \r
   ReturnReg = EfiCallEsalService (\r
                 &Guid,\r
@@ -358,7 +382,10 @@ Returns:
 --*/\r
 {\r
   SAL_RETURN_REGS ReturnReg;\r
-  EFI_GUID        Guid = EFI_EXTENDED_SAL_MTC_SERVICES_PROTOCOL_GUID;\r
+  EFI_GUID        Guid;\r
+\r
+  *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_MTC_SERVICES_PROTOCOL_GUID_LO;\r
+  *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_MTC_SERVICES_PROTOCOL_GUID_HI;\r
 \r
   ReturnReg = EfiCallEsalService (&Guid, GetNextHighMonotonicCount, (UINT64) HighCount, 0, 0, 0, 0, 0, 0);\r
   return (EFI_STATUS) ReturnReg.Status;\r
@@ -388,7 +415,7 @@ Returns:
 \r
 --*/\r
 {\r
-  return mRT->ConvertPointer (DebugDisposition, Address);\r
+  return mRTEdkDxeRuntimeDriverLib->ConvertPointer (DebugDisposition, Address);\r
 }\r
 \r
 EFI_STATUS\r
@@ -472,7 +499,10 @@ EfiSetVirtualAddressMap (
   )\r
 {\r
   SAL_RETURN_REGS ReturnReg;\r
-  EFI_GUID        Guid = EFI_EXTENDED_SAL_VIRTUAL_SERVICES_PROTOCOL_GUID;\r
+  EFI_GUID        Guid;\r
+\r
+  *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_VIRTUAL_SERVICES_PROTOCOL_GUID_LO;\r
+  *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_VIRTUAL_SERVICES_PROTOCOL_GUID_HI;\r
 \r
   ReturnReg = EfiCallEsalService (\r
                 &Guid,\r