Update EFI_CAPSULE_HEADER definition.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2987 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/Capsule/RuntimeDxe/CapsuleService.c b/MdeModulePkg/Universal/Capsule/RuntimeDxe/CapsuleService.c
index 2153b2089665442a51523d3f8a134e436721939f..7370eb41987b6e2e0bd67c6a709348d93648b3eb 100644 (file)
--- a/MdeModulePkg/Universal/Capsule/RuntimeDxe/CapsuleService.c
+++ b/MdeModulePkg/Universal/Capsule/RuntimeDxe/CapsuleService.c
@@ -24,7 +24,7 @@ Abstract:
 EFI_STATUS\r
 EFIAPI\r
 UpdateCapsule (\r
-  IN UEFI_CAPSULE_HEADER     **CapsuleHeaderArray,\r
+  IN EFI_CAPSULE_HEADER      **CapsuleHeaderArray,\r
   IN UINTN                   CapsuleCount,\r
   IN EFI_PHYSICAL_ADDRESS    ScatterGatherList OPTIONAL\r
   )\r
@@ -56,7 +56,7 @@ Returns:
   VOID                      *BufferPtr;\r
   EFI_STATUS                Status;\r
   EFI_HANDLE                FvHandle;\r
-  UEFI_CAPSULE_HEADER       *CapsuleHeader;\r
+  EFI_CAPSULE_HEADER        *CapsuleHeader;\r
 \r
   if (CapsuleCount < 1) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -152,7 +152,7 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 QueryCapsuleCapabilities (\r
-  IN  UEFI_CAPSULE_HEADER  **CapsuleHeaderArray,\r
+  IN  EFI_CAPSULE_HEADER   **CapsuleHeaderArray,\r
   IN  UINTN                CapsuleCount,\r
   OUT UINT64               *MaxiumCapsuleSize,\r
   OUT EFI_RESET_TYPE       *ResetType\r
@@ -181,7 +181,7 @@ Returns:
 --*/\r
 {\r
   UINTN                     ArrayNumber;\r
-  UEFI_CAPSULE_HEADER       *CapsuleHeader;\r
+  EFI_CAPSULE_HEADER        *CapsuleHeader;\r
 \r
   if (CapsuleCount < 1) {\r
     return EFI_INVALID_PARAMETER;\r

diff --git a/MdePkg/Library/UefiRuntimeLib/RuntimeService.c b/MdePkg/Library/UefiRuntimeLib/RuntimeService.c
index 24fe151246b46acd9187e98a18a333cb0fa867c4..3a1e2f04a0fa54ce3732d509229cfa072739e87a 100644 (file)
--- a/MdePkg/Library/UefiRuntimeLib/RuntimeService.c
+++ b/MdePkg/Library/UefiRuntimeLib/RuntimeService.c
@@ -408,9 +408,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 EFI_CAPSULE_HEADER   **CapsuleHeaderArray,\r
+  IN UINTN                CapsuleCount,\r
+  IN EFI_PHYSICAL_ADDRESS ScatterGatherList OPTIONAL\r
   )\r
 {\r
   return mRT->UpdateCapsule (\r
@@ -423,10 +423,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 EFI_CAPSULE_HEADER   **CapsuleHeaderArray,\r
+  IN UINTN                CapsuleCount,\r
+  OUT UINT64              *MaximumCapsuleSize,\r
+  OUT EFI_RESET_TYPE      *ResetType\r
   )\r
 {\r
   return mRT->QueryCapsuleCapabilities (\r
@@ -441,10 +441,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 mRT->QueryVariableInfo (\r