MdeModulePkg CapsulePei: Fix some typos

Cc: Jiewen Yao <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>

diff --git a/MdeModulePkg/Universal/CapsulePei/Capsule.h b/MdeModulePkg/Universal/CapsulePei/Capsule.h
index 68d8e427459f68f8dffda252c25dde0a5512f715..411dffa682a1387a7477b8cedf617e5c1b1ed0a5 100644 (file)
--- a/MdeModulePkg/Universal/CapsulePei/Capsule.h
+++ b/MdeModulePkg/Universal/CapsulePei/Capsule.h
@@ -1,6 +1,6 @@
 /** @file\r
 \r
-Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
@@ -119,10 +119,8 @@ typedef union {
 typedef\r
 EFI_STATUS\r
 (*COALESCE_ENTRY) (\r
-  IN EFI_PEI_SERVICES                **PeiServices,\r
-  IN EFI_CAPSULE_BLOCK_DESCRIPTOR    *BlockList,\r
-  IN OUT VOID                        **MemoryBase,\r
-  IN OUT UINTN                       *MemorySize\r
+  SWITCH_32_TO_64_CONTEXT       *EntrypointContext,\r
+  SWITCH_64_TO_32_CONTEXT       *ReturnContext\r
   );\r
 \r
 #endif\r

diff --git a/MdeModulePkg/Universal/CapsulePei/Common/CapsuleCoalesce.c b/MdeModulePkg/Universal/CapsulePei/Common/CapsuleCoalesce.c
index d789fbbc7562ce6318b2bcf1e6b20f2ea8ea108f..006d9006369c280182a7e56c461d0ae944466351 100644 (file)
--- a/MdeModulePkg/Universal/CapsulePei/Common/CapsuleCoalesce.c
+++ b/MdeModulePkg/Universal/CapsulePei/Common/CapsuleCoalesce.c
@@ -10,7 +10,7 @@
   into memory.\r
 \r
 (C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>\r
-Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -1034,7 +1034,7 @@ CapsuleDataCoalesce (
   PrivateData.CapsuleNumber       = (UINT64) CapsuleNumber;\r
   PrivateData.CapsuleOffset[0]    = 0;\r
   //\r
-  // NOTE: Only data in sizeof (EFI_CAPSULE_PEIM_PRIVATE_DATA) is valid, CapsuleOffset field is unitialized at this moment.\r
+  // NOTE: Only data in sizeof (EFI_CAPSULE_PEIM_PRIVATE_DATA) is valid, CapsuleOffset field is uninitialized at this moment.\r
   // The code sets partial length here for Descriptor.Length check, but later it will use full length to reserve those PrivateData region.\r
   //\r
   PrivateDataDesc[0].Union.DataBlock  = (EFI_PHYSICAL_ADDRESS) (UINTN) &PrivateData;\r
@@ -1042,12 +1042,12 @@ CapsuleDataCoalesce (
   PrivateDataDesc[1].Union.DataBlock  = (EFI_PHYSICAL_ADDRESS) (UINTN) BlockList;\r
   PrivateDataDesc[1].Length           = 0;\r
   //\r
-  // Add PrivateDataDesc[0] in beginning beginning, as it is new descriptor. PrivateDataDesc[1] is NOT needed.\r
+  // Add PrivateDataDesc[0] in beginning, as it is new descriptor. PrivateDataDesc[1] is NOT needed.\r
   // In addition, one NULL terminator is added in the end. See RelocateBlockDescriptors().\r
   //\r
   NumDescriptors  += 2;\r
   //\r
-  // Sandity check\r
+  // Sanity check\r
   //\r
   if (CapsuleSize >= (MAX_ADDRESS - (sizeof (EFI_CAPSULE_PEIM_PRIVATE_DATA) + (CapsuleNumber - 1) * sizeof(UINT64) + sizeof(UINT64)))) {\r
     DEBUG ((EFI_D_ERROR, "ERROR: CapsuleSize - 0x%x\n", CapsuleSize));\r
@@ -1059,7 +1059,7 @@ CapsuleDataCoalesce (
   CapsuleSize     += sizeof (EFI_CAPSULE_PEIM_PRIVATE_DATA) + (CapsuleNumber - 1) * sizeof(UINT64) + sizeof(UINT64);\r
   BlockList        = PrivateDataDesc;\r
   //\r
-  // Sandity check\r
+  // Sanity check\r
   //\r
   if (NumDescriptors >= (MAX_ADDRESS / sizeof(EFI_CAPSULE_BLOCK_DESCRIPTOR))) {\r
     DEBUG ((EFI_D_ERROR, "ERROR: NumDescriptors - 0x%x\n", NumDescriptors));\r
@@ -1067,7 +1067,7 @@ CapsuleDataCoalesce (
   }\r
   DescriptorsSize  = NumDescriptors * sizeof (EFI_CAPSULE_BLOCK_DESCRIPTOR);\r
   //\r
-  // Sandity check\r
+  // Sanity check\r
   //\r
   if (DescriptorsSize >= (MAX_ADDRESS - CapsuleSize)) {\r
     DEBUG ((EFI_D_ERROR, "ERROR: DescriptorsSize - 0x%lx, CapsuleSize - 0x%lx\n", (UINT64)DescriptorsSize, (UINT64)CapsuleSize));\r

diff --git a/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c b/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c
index 61fafc7fe0cab3d04ce8490f21876322c4bb6033..befd803af17b82f4261b778f4c0d6c50ed79ba6b 100644 (file)
--- a/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c
+++ b/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c
@@ -1,7 +1,7 @@
 /** @file\r
   Capsule update PEIM for UEFI2.0\r
 \r
-Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
@@ -1006,7 +1006,7 @@ CreateState (
   CopyMem ((VOID *) (UINTN) NewBuffer, (VOID *) (UINTN) ((UINT8 *)PrivateData + sizeof(EFI_CAPSULE_PEIM_PRIVATE_DATA) + (CapsuleNumber - 1) * sizeof(UINT64)), Size);\r
   //\r
   // Check for test data pattern. If it is the test pattern, then we'll\r
-  // test it ans still create the HOB so that it can be used to verify\r
+  // test it and still create the HOB so that it can be used to verify\r
   // that capsules don't get corrupted all the way into BDS. BDS will\r
   // still try to turn it into a firmware volume, but will think it's\r
   // corrupted so nothing will happen.\r