removing the dependency on EDKDxeSalLib and EdxDxeRuntimeSalLib, instead using DxeExt...

[mirror_edk2.git] / EdkModulePkg / Library / EdkUefiRuntimeLib / Ipf / RuntimeService.c

diff --git a/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeService.c b/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeService.c
index b4a56a23b31aef19f02a4c6ecb1d2386a80dc78f..ba8cacd44c4b19410e30da6ad11ccc9c239ab520 100644 (file)
--- a/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeService.c
+++ b/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeService.c
@@ -45,9 +45,12 @@ Returns:
 \r
 --*/\r
 {\r
-  EFI_GUID Guid = EFI_EXTENDED_SAL_RESET_SERVICES_PROTOCOL_GUID;\r
+  EFI_GUID Guid;\r
 \r
-  EfiCallEsalService (\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
+  EsalCall (\r
     &Guid,\r
     ResetSystem,\r
     (UINT64) ResetType,\r
@@ -91,9 +94,12 @@ 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
+  ReturnReg = EsalCall (&Guid, GetTime, (UINT64) Time, (UINT64) Capabilities, 0, 0, 0, 0, 0);\r
   return ReturnReg.Status;\r
 }\r
 \r
@@ -119,9 +125,12 @@ 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
+  ReturnReg = EsalCall (&Guid, SetTime, (UINT64) Time, 0, 0, 0, 0, 0, 0);\r
   return ReturnReg.Status;\r
 }\r
 \r
@@ -151,9 +160,12 @@ Returns:
 --*/\r
 {\r
   SAL_RETURN_REGS ReturnReg;\r
-  EFI_GUID        Guid = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID;\r
+  EFI_GUID        Guid;\r
 \r
-  ReturnReg = EfiCallEsalService (&Guid, GetWakeupTime, (UINT64) Enabled, (UINT64) Pending, (UINT64) Time, 0, 0, 0, 0);\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 = EsalCall (&Guid, GetWakeupTime, (UINT64) Enabled, (UINT64) Pending, (UINT64) Time, 0, 0, 0, 0);\r
   return ReturnReg.Status;\r
 }\r
 \r
@@ -182,9 +194,12 @@ 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
+  ReturnReg = EsalCall (&Guid, SetWakeupTime, (UINT64) Enable, (UINT64) Time, 0, 0, 0, 0, 0);\r
   return ReturnReg.Status;\r
 }\r
 \r
@@ -221,9 +236,12 @@ Returns:
 --*/\r
 {\r
   SAL_RETURN_REGS ReturnReg;\r
-  EFI_GUID        Guid = EFI_EXTENDED_SAL_VARIABLE_SERVICES_PROTOCOL_GUID;\r
+  EFI_GUID        Guid;\r
 \r
-  ReturnReg = EfiCallEsalService (\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 = EsalCall (\r
                 &Guid,\r
                 EsalGetVariable,\r
                 (UINT64) VariableName,\r
@@ -268,9 +286,12 @@ 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
+  ReturnReg = EsalCall (\r
                 &Guid,\r
                 EsalGetNextVariableName,\r
                 (UINT64) VariableNameSize,\r
@@ -315,9 +336,12 @@ 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
+  ReturnReg = EsalCall (\r
                 &Guid,\r
                 EsalSetVariable,\r
                 (UINT64) VariableName,\r
@@ -353,9 +377,12 @@ Returns:
 --*/\r
 {\r
   SAL_RETURN_REGS ReturnReg;\r
-  EFI_GUID        Guid = EFI_EXTENDED_SAL_MTC_SERVICES_PROTOCOL_GUID;\r
+  EFI_GUID        Guid;\r
 \r
-  ReturnReg = EfiCallEsalService (&Guid, GetNextHighMonotonicCount, (UINT64) HighCount, 0, 0, 0, 0, 0, 0);\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 = EsalCall (&Guid, GetNextHighMonotonicCount, (UINT64) HighCount, 0, 0, 0, 0, 0, 0);\r
   return (EFI_STATUS) ReturnReg.Status;\r
 }\r
 \r
@@ -467,9 +494,12 @@ 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
+  ReturnReg = EsalCall (\r
                 &Guid,\r
                 SetVirtualAddress,\r
                 (UINT64) MemoryMapSize,\r