1. Move Capsule variable name definition to Capsule variable GUID header file.

2. Align EFI_CAPSULE_LONG_MODE_BUFFER structure to MdeModulePkg definition.

Signed-off-by: lgao4
Reviewed-by: hhtian
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12492 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EdkCompatibilityPkg/Foundation/Guid/Capsule/Capsule.h b/EdkCompatibilityPkg/Foundation/Guid/Capsule/Capsule.h
index aa29273e15eac9b3f7aad9e774de59db775f2c44..49c64e946cae2805acb939b5591f12224172fc3c 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Guid/Capsule/Capsule.h
+++ b/EdkCompatibilityPkg/Foundation/Guid/Capsule/Capsule.h
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2011, 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
@@ -30,6 +30,23 @@ Abstract:
 #define EFI_CAPSULE_VENDOR_GUID  \\r
   { 0x711C703F, 0xC285, 0x4B10, {0xA3, 0xB0, 0x36, 0xEC, 0xBD, 0x3C, 0x8B, 0xE2} }\r
   \r
+//\r
+// If capsule data is passed via a variable, then this name should be used.\r
+//\r
+#define EFI_CAPSULE_VARIABLE_NAME L"CapsuleUpdateData"\r
+\r
+//\r
+// The variable describes the long mode buffer used by IA32 Capsule PEIM\r
+// to call X64 CapsuleCoalesce code to handle >4GB capsule blocks.\r
+//\r
+#define EFI_CAPSULE_LONG_MODE_BUFFER_NAME L"CapsuleLongModeBuffer"\r
+\r
+typedef struct {\r
+  EFI_PHYSICAL_ADDRESS   Base;\r
+  EFI_PHYSICAL_ADDRESS   Length;\r
+  UINT64                 StackSize;\r
+} EFI_CAPSULE_LONG_MODE_BUFFER;\r
+\r
 extern EFI_GUID gEfiCapsuleVendorGuid;\r
 \r
 #endif // #ifndef _EFI_CAPSULE_VENDOR_GUID_H_\r

diff --git a/EdkCompatibilityPkg/Sample/Platform/Generic/Pei/Capsule/Capsule.h b/EdkCompatibilityPkg/Sample/Platform/Generic/Pei/Capsule/Capsule.h
index 099ce167d324ee6daeb57af7f36a044f874fa567..204ee8ce4a8f0f6abffa12999a9480917fc6ade6 100644 (file)
--- a/EdkCompatibilityPkg/Sample/Platform/Generic/Pei/Capsule/Capsule.h
+++ b/EdkCompatibilityPkg/Sample/Platform/Generic/Pei/Capsule/Capsule.h
@@ -1,6 +1,6 @@
 /*++        \r
 \r
-Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2011, 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
@@ -21,20 +21,6 @@ Abstract:
 #define _CAPSULE_PEIM_H\r
 \r
 #include "Tiano.h"\r
-\r
-//\r
-// If capsule data is passed via a variable, then this name should be used.\r
-//\r
-#define EFI_CAPSULE_VARIABLE_NAME L"CapsuleUpdateData"\r
-\r
-//\r
-// The variable describes the long mode buffer used by IA32 Capsule PEIM\r
-// to call X64 CapsuleCoalesce code to handle >4GB capsule blocks.\r
-//\r
-#define EFI_CAPSULE_LONG_MODE_BUFFER_NAME L"CapsuleLongModeBuffer"\r
-typedef struct {\r
-  UINT64   Base;\r
-  UINT64   Length;\r
-} EFI_CAPSULE_LONG_MODE_BUFFER;\r
+#include EFI_GUID_DEFINITION (Capsule)\r
 \r
 #endif\r