X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=EdkModulePkg%2FLibrary%2FEdkUefiRuntimeLib%2FIpf%2FRuntimeService.c;h=0760bfa074e7aa26cbd60ac05fc46e3a324cf483;hp=2e8794068abb3b3b5fc4b555a36e72c544537e7d;hb=aa156393bf28ce3c44d84b773e398070d1f4fe79;hpb=e8a3bee0364b5a952f7b1e73dc012b52bec1b4a0

diff --git a/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeService.c b/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeService.c
index 2e8794068a..0760bfa074 100644
--- a/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeService.c
+++ b/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeService.c
@@ -45,7 +45,10 @@ Returns:
 
 --*/
 {
-  EFI_GUID Guid = EFI_EXTENDED_SAL_RESET_SERVICES_PROTOCOL_GUID;
+  EFI_GUID Guid;
+
+  *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_RESET_SERVICES_PROTOCOL_GUID_LO;
+  *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_RESET_SERVICES_PROTOCOL_GUID_HI;
 
   EfiCallEsalService (
     &Guid,
@@ -81,7 +84,7 @@ Routine Description:
 Arguments:
 
   Time          - A pointer to storage to receive a snapshot of the current time.
-  Capabilities  - An optional pointer to a buffer to receive the real time clock device¡¯s
+  Capabilities  - An optional pointer to a buffer to receive the real time clock device's
                   capabilities.
 
 Returns:
@@ -91,7 +94,10 @@ Returns:
 --*/
 {
   SAL_RETURN_REGS ReturnReg;
-  EFI_GUID Guid = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID;
+  EFI_GUID        Guid;
+
+  *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID_LO;
+  *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID_HI;
 
   ReturnReg = EfiCallEsalService (&Guid, GetTime, (UINT64) Time, (UINT64) Capabilities, 0, 0, 0, 0, 0);
   return ReturnReg.Status;
@@ -119,8 +125,10 @@ Returns:
 --*/
 {
   SAL_RETURN_REGS ReturnReg;
+  EFI_GUID        Guid;
 
-  EFI_GUID Guid = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID;
+  *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID_LO;
+  *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID_HI;
 
   ReturnReg = EfiCallEsalService (&Guid, SetTime, (UINT64) Time, 0, 0, 0, 0, 0, 0);
   return ReturnReg.Status;
@@ -152,8 +160,10 @@ Returns:
 --*/
 {
   SAL_RETURN_REGS ReturnReg;
+  EFI_GUID        Guid;
 
-  EFI_GUID Guid = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID;
+  *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID_LO;
+  *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID_HI;
 
   ReturnReg = EfiCallEsalService (&Guid, GetWakeupTime, (UINT64) Enabled, (UINT64) Pending, (UINT64) Time, 0, 0, 0, 0);
   return ReturnReg.Status;
@@ -184,8 +194,10 @@ Returns:
 --*/
 {
   SAL_RETURN_REGS ReturnReg;
+  EFI_GUID        Guid;
 
-  EFI_GUID Guid = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID;
+  *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID_LO;
+  *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID_HI;
 
   ReturnReg = EfiCallEsalService (&Guid, SetWakeupTime, (UINT64) Enable, (UINT64) Time, 0, 0, 0, 0, 0);
   return ReturnReg.Status;
@@ -209,7 +221,7 @@ Routine Description:
 Arguments:
 
   VariableName  - A Null-terminated Unicode string that is the name of the
-                  vendor¡¯s variable.
+                  vendor's variable.
   VendorGuid    - A unique identifier for the vendor.
   Attributes    - If not NULL, a pointer to the memory location to return the
                   attributes bitmask for the variable.
@@ -224,7 +236,10 @@ Returns:
 --*/
 {
   SAL_RETURN_REGS ReturnReg;
-  EFI_GUID Guid = EFI_EXTENDED_SAL_VARIABLE_SERVICES_PROTOCOL_GUID;
+  EFI_GUID        Guid;
+
+  *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_VARIABLE_SERVICES_PROTOCOL_GUID_LO;
+  *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_VARIABLE_SERVICES_PROTOCOL_GUID_HI;
 
   ReturnReg = EfiCallEsalService (
                 &Guid,
@@ -271,7 +286,10 @@ Returns:
 --*/
 {
   SAL_RETURN_REGS ReturnReg;
-  EFI_GUID Guid = EFI_EXTENDED_SAL_VARIABLE_SERVICES_PROTOCOL_GUID;
+  EFI_GUID        Guid;
+
+  *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_VARIABLE_SERVICES_PROTOCOL_GUID_LO;
+  *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_VARIABLE_SERVICES_PROTOCOL_GUID_HI;
 
   ReturnReg = EfiCallEsalService (
                 &Guid,
@@ -305,7 +323,7 @@ Routine Description:
 Arguments:
 
   VariableName  - A Null-terminated Unicode string that is the name of the
-                  vendor¡¯s variable.
+                  vendor's variable.
   VendorGuid    - A unique identifier for the vendor.
   Attributes    - Attributes bitmask to set for the variable.
   DataSize      - The size in bytes of the Data buffer.
@@ -318,7 +336,10 @@ Returns:
 --*/
 {
   SAL_RETURN_REGS ReturnReg;
-  EFI_GUID Guid = EFI_EXTENDED_SAL_VARIABLE_SERVICES_PROTOCOL_GUID;
+  EFI_GUID        Guid;
+
+  *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_VARIABLE_SERVICES_PROTOCOL_GUID_LO;
+  *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_VARIABLE_SERVICES_PROTOCOL_GUID_HI;
 
   ReturnReg = EfiCallEsalService (
                 &Guid,
@@ -343,7 +364,7 @@ EfiGetNextHighMonotonicCount (
 
 Routine Description:
 
-  Returns the next high 32 bits of the platform¡¯s monotonic counter.
+  Returns the next high 32 bits of the platform's monotonic counter.
 
 Arguments:
 
@@ -356,8 +377,10 @@ Returns:
 --*/
 {
   SAL_RETURN_REGS ReturnReg;
+  EFI_GUID        Guid;
 
-  EFI_GUID Guid = EFI_EXTENDED_SAL_MTC_SERVICES_PROTOCOL_GUID;
+  *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_MTC_SERVICES_PROTOCOL_GUID_LO;
+  *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_MTC_SERVICES_PROTOCOL_GUID_HI;
 
   ReturnReg = EfiCallEsalService (&Guid, GetNextHighMonotonicCount, (UINT64) HighCount, 0, 0, 0, 0, 0, 0);
   return (EFI_STATUS) ReturnReg.Status;
@@ -367,7 +390,7 @@ EFI_STATUS
 EFIAPI
 EfiConvertPointer (
   IN UINTN                  DebugDisposition,
-  IN OUT VOID               *Address
+  IN OUT VOID               **Address
   )
 /*++
 
@@ -471,7 +494,10 @@ EfiSetVirtualAddressMap (
   )
 {
   SAL_RETURN_REGS ReturnReg;
-  EFI_GUID        Guid = EFI_EXTENDED_SAL_VIRTUAL_SERVICES_PROTOCOL_GUID;
+  EFI_GUID        Guid;
+
+  *((UINT64 *) &Guid) = EFI_EXTENDED_SAL_VIRTUAL_SERVICES_PROTOCOL_GUID_LO;
+  *(((UINT64 *)&Guid) + 1) = EFI_EXTENDED_SAL_VIRTUAL_SERVICES_PROTOCOL_GUID_HI;
 
   ReturnReg = EfiCallEsalService (
                 &Guid,
@@ -492,9 +518,9 @@ EfiSetVirtualAddressMap (
 EFI_STATUS
 EFIAPI
 EfiUpdateCapsule (
-  IN UEFI_CAPSULE_HEADER	**CapsuleHeaderArray,
-  IN UINTN				    CapsuleCount,
-  IN EFI_PHYSICAL_ADDRESS	ScatterGatherList	OPTIONAL
+  IN UEFI_CAPSULE_HEADER  **CapsuleHeaderArray,
+  IN UINTN                CapsuleCount,
+  IN EFI_PHYSICAL_ADDRESS ScatterGatherList OPTIONAL
   )
 {
   return EFI_UNSUPPORTED;
@@ -503,10 +529,10 @@ EfiUpdateCapsule (
 EFI_STATUS
 EFIAPI
 EfiQueryCapsuleCapabilities (
-  IN UEFI_CAPSULE_HEADER	**CapsuleHeaderArray,
-  IN UINTN				    CapsuleCount,
-  OUT	UINT64			    *MaximumCapsuleSize,
-  OUT EFI_RESET_TYPE		*ResetType
+  IN UEFI_CAPSULE_HEADER  **CapsuleHeaderArray,
+  IN UINTN                CapsuleCount,
+  OUT UINT64              *MaximumCapsuleSize,
+  OUT EFI_RESET_TYPE    *ResetType
   )
 {
   return EFI_UNSUPPORTED;
@@ -516,10 +542,10 @@ EfiQueryCapsuleCapabilities (
 EFI_STATUS
 EFIAPI
 EfiQueryVariableInfo (
-  IN UINT32			  Attributes,
-  OUT UINT64			*MaximumVariableStorageSize,
-  OUT	 UINT64			*RemainingVariableStorageSize,
-  OUT UINT64			*MaximumVariableSize
+  IN UINT32       Attributes,
+  OUT UINT64      *MaximumVariableStorageSize,
+  OUT  UINT64     *RemainingVariableStorageSize,
+  OUT UINT64      *MaximumVariableSize
   )
 {
   return EFI_UNSUPPORTED;