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 13fa9d7e0a70d87e214f43be35c1bbc54dc5c16a..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
-  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
@@ -81,7 +84,7 @@ Routine Description:
 Arguments:\r
 \r
   Time          - A pointer to storage to receive a snapshot of the current time.\r
-  Capabilities  - An optional pointer to a buffer to receive the real time clock device¡¯s\r
+  Capabilities  - An optional pointer to a buffer to receive the real time clock device's\r
                   capabilities.\r
 \r
 Returns:\r
@@ -91,7 +94,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
@@ -119,8 +125,10 @@ Returns:
 --*/\r
 {\r
   SAL_RETURN_REGS ReturnReg;\r
+  EFI_GUID        Guid;\r
 \r
-  EFI_GUID Guid = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID;\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
@@ -152,8 +160,10 @@ Returns:
 --*/\r
 {\r
   SAL_RETURN_REGS ReturnReg;\r
+  EFI_GUID        Guid;\r
 \r
-  EFI_GUID Guid = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID;\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
@@ -184,8 +194,10 @@ Returns:
 --*/\r
 {\r
   SAL_RETURN_REGS ReturnReg;\r
+  EFI_GUID        Guid;\r
 \r
-  EFI_GUID Guid = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID;\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
@@ -209,7 +221,7 @@ Routine Description:
 Arguments:\r
 \r
   VariableName  - A Null-terminated Unicode string that is the name of the\r
-                  vendor¡¯s variable.\r
+                  vendor's variable.\r
   VendorGuid    - A unique identifier for the vendor.\r
   Attributes    - If not NULL, a pointer to the memory location to return the\r
                   attributes bitmask for the variable.\r
@@ -224,7 +236,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
@@ -271,7 +286,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
@@ -305,7 +323,7 @@ Routine Description:
 Arguments:\r
 \r
   VariableName  - A Null-terminated Unicode string that is the name of the\r
-                  vendor¡¯s variable.\r
+                  vendor's variable.\r
   VendorGuid    - A unique identifier for the vendor.\r
   Attributes    - Attributes bitmask to set for the variable.\r
   DataSize      - The size in bytes of the Data buffer.\r
@@ -318,7 +336,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
@@ -343,7 +364,7 @@ EfiGetNextHighMonotonicCount (
 \r
 Routine Description:\r
 \r
-  Returns the next high 32 bits of the platform¡¯s monotonic counter.\r
+  Returns the next high 32 bits of the platform's monotonic counter.\r
 \r
 Arguments:\r
 \r
@@ -356,8 +377,10 @@ Returns:
 --*/\r
 {\r
   SAL_RETURN_REGS ReturnReg;\r
+  EFI_GUID        Guid;\r
 \r
-  EFI_GUID Guid = EFI_EXTENDED_SAL_MTC_SERVICES_PROTOCOL_GUID;\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
@@ -471,7 +494,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
@@ -492,9 +518,9 @@ EfiSetVirtualAddressMap (
 EFI_STATUS\r
 EFIAPI\r
 EfiUpdateCapsule (\r
-  IN UEFI_CAPSULE_HEADER       **CapsuleHeaderArray,\r
-  IN UINTN                                 CapsuleCount,\r
-  IN EFI_PHYSICAL_ADDRESS      ScatterGatherList       OPTIONAL\r
+  IN UEFI_CAPSULE_HEADER  **CapsuleHeaderArray,\r
+  IN UINTN                CapsuleCount,\r
+  IN EFI_PHYSICAL_ADDRESS ScatterGatherList OPTIONAL\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r
@@ -503,10 +529,10 @@ EfiUpdateCapsule (
 EFI_STATUS\r
 EFIAPI\r
 EfiQueryCapsuleCapabilities (\r
-  IN UEFI_CAPSULE_HEADER       **CapsuleHeaderArray,\r
-  IN UINTN                                 CapsuleCount,\r
-  OUT  UINT64                      *MaximumCapsuleSize,\r
-  OUT EFI_RESET_TYPE           *ResetType\r
+  IN UEFI_CAPSULE_HEADER  **CapsuleHeaderArray,\r
+  IN UINTN                CapsuleCount,\r
+  OUT UINT64              *MaximumCapsuleSize,\r
+  OUT EFI_RESET_TYPE    *ResetType\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r
@@ -516,10 +542,10 @@ EfiQueryCapsuleCapabilities (
 EFI_STATUS\r
 EFIAPI\r
 EfiQueryVariableInfo (\r
-  IN UINT32                      Attributes,\r
-  OUT UINT64                   *MaximumVariableStorageSize,\r
-  OUT   UINT64                 *RemainingVariableStorageSize,\r
-  OUT UINT64                   *MaximumVariableSize\r
+  IN UINT32       Attributes,\r
+  OUT UINT64      *MaximumVariableStorageSize,\r
+  OUT  UINT64     *RemainingVariableStorageSize,\r
+  OUT UINT64      *MaximumVariableSize\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r