changed the guid assignment from constant array to hi and low UINT64s (Intel compiler...

[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..0760bfa074e7aa26cbd60ac05fc46e3a324cf483 100644 (file)
--- a/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeService.c
+++ b/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeService.c
@@ -45,7 +45,10 @@ Returns:
 \r
 --*/\r
 {\r
 \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
 \r
   EfiCallEsalService (\r
     &Guid,\r


@@ -91,7 +94,10 @@ Returns:
 --*/\r
 {\r
   SAL_RETURN_REGS ReturnReg;\r
 --*/\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
 \r
   ReturnReg = EfiCallEsalService (&Guid, GetTime, (UINT64) Time, (UINT64) Capabilities, 0, 0, 0, 0, 0);\r
   return ReturnReg.Status;\r


@@ -119,7 +125,10 @@ Returns:
 --*/\r
 {\r
   SAL_RETURN_REGS ReturnReg;\r
 --*/\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
 \r
   ReturnReg = EfiCallEsalService (&Guid, SetTime, (UINT64) Time, 0, 0, 0, 0, 0, 0);\r
   return ReturnReg.Status;\r


@@ -151,7 +160,10 @@ Returns:
 --*/\r
 {\r
   SAL_RETURN_REGS ReturnReg;\r
 --*/\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
 \r
   ReturnReg = EfiCallEsalService (&Guid, GetWakeupTime, (UINT64) Enabled, (UINT64) Pending, (UINT64) Time, 0, 0, 0, 0);\r
   return ReturnReg.Status;\r


@@ -182,7 +194,10 @@ Returns:
 --*/\r
 {\r
   SAL_RETURN_REGS ReturnReg;\r
 --*/\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
 \r
   ReturnReg = EfiCallEsalService (&Guid, SetWakeupTime, (UINT64) Enable, (UINT64) Time, 0, 0, 0, 0, 0);\r
   return ReturnReg.Status;\r


@@ -221,7 +236,10 @@ Returns:
 --*/\r
 {\r
   SAL_RETURN_REGS ReturnReg;\r
 --*/\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
 \r
   ReturnReg = EfiCallEsalService (\r
                 &Guid,\r


@@ -268,7 +286,10 @@ Returns:
 --*/\r
 {\r
   SAL_RETURN_REGS ReturnReg;\r
 --*/\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
 \r
   ReturnReg = EfiCallEsalService (\r
                 &Guid,\r


@@ -315,7 +336,10 @@ Returns:
 --*/\r
 {\r
   SAL_RETURN_REGS ReturnReg;\r
 --*/\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
 \r
   ReturnReg = EfiCallEsalService (\r
                 &Guid,\r


@@ -353,7 +377,10 @@ Returns:
 --*/\r
 {\r
   SAL_RETURN_REGS ReturnReg;\r
 --*/\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
 \r
   ReturnReg = EfiCallEsalService (&Guid, GetNextHighMonotonicCount, (UINT64) HighCount, 0, 0, 0, 0, 0, 0);\r
   return (EFI_STATUS) ReturnReg.Status;\r


@@ -467,7 +494,10 @@ EfiSetVirtualAddressMap (
   )\r
 {\r
   SAL_RETURN_REGS ReturnReg;\r
   )\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
 \r
   ReturnReg = EfiCallEsalService (\r
                 &Guid,\r