Move the definition of Capsule from IntelFrameworkPkg/Include/Framework/Capsule.h...

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

diff --git a/IntelFrameworkPkg/Include/Framework/Capsule.h b/IntelFrameworkPkg/Include/Framework/Capsule.h
deleted file mode 100644 (file)
index 8457934..0000000
--- a/IntelFrameworkPkg/Include/Framework/Capsule.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/** @file\r
-  Defines for the EFI Capsule functionality.\r
-\r
-  Copyright (c) 2007, Intel Corporation\r
-  All rights reserved. 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
-  http://opensource.org/licenses/bsd-license.php\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-\r
-  Module Name:  Capsule.h\r
-\r
-  @par Revision Reference:\r
-  These definitions are from Capsule Spec Version 0.9.\r
-\r
-**/\r
-\r
-#ifndef _EFI_CAPSULE_H_\r
-#define _EFI_CAPSULE_H_\r
-\r
-#include <PiPei.h>\r
-\r
-//\r
-// Bits in the flags field of the capsule header\r
-//\r
-#define EFI_CAPSULE_HEADER_FLAG_SETUP 0x00000001  // supports setup changes\r
-\r
-\r
-#define CAPSULE_BLOCK_DESCRIPTOR_SIGNATURE  EFI_SIGNATURE_32 ('C', 'B', 'D', 'S')\r
-\r
-//\r
-// An array of these describe the blocks that make up a capsule for\r
-// a capsule update.\r
-//\r
-typedef struct {\r
-  UINT64                Length;     // length of the data block\r
-  EFI_PHYSICAL_ADDRESS  Data;       // physical address of the data block\r
-  UINT32                Signature;  // CBDS\r
-  UINT32                CheckSum;   // to sum this structure to 0\r
-} FRAMEWORK_EFI_CAPSULE_BLOCK_DESCRIPTOR;\r
-\r
-typedef struct {\r
-  EFI_GUID  OemGuid;\r
-  UINT32    HeaderSize;\r
-  //\r
-  // UINT8                       OemHdrData[];\r
-  //\r
-} EFI_CAPSULE_OEM_HEADER;\r
-\r
-typedef struct {\r
-  EFI_GUID  CapsuleGuid;\r
-  UINT32    HeaderSize;\r
-  UINT32    Flags;\r
-  UINT32    CapsuleImageSize;\r
-  UINT32    SequenceNumber;\r
-  EFI_GUID  InstanceId;\r
-  UINT32    OffsetToSplitInformation;\r
-  UINT32    OffsetToCapsuleBody;\r
-  UINT32    OffsetToOemDefinedHeader;\r
-  UINT32    OffsetToAuthorInformation;\r
-  UINT32    OffsetToRevisionInformation;\r
-  UINT32    OffsetToShortDescription;\r
-  UINT32    OffsetToLongDescription;\r
-  UINT32    OffsetToApplicableDevices;\r
-} FRAMEWORK_EFI_CAPSULE_HEADER;\r
-\r
-#endif // #ifndef _EFI_CAPSULE_H_\r

diff --git a/IntelFrameworkPkg/Include/FrameworkPei.h b/IntelFrameworkPkg/Include/FrameworkPei.h
index f7255bb4e8f2dbd27eb96018ca60de136b81c9aa..93f2cc9798662b9dc786289ed6cea7e66581b33a 100644 (file)
--- a/IntelFrameworkPkg/Include/FrameworkPei.h
+++ b/IntelFrameworkPkg/Include/FrameworkPei.h
@@ -22,7 +22,6 @@
 \r
 #include <PiPei.h>\r
 \r
-#include <Framework/Capsule.h>\r
 #include <Framework/DataHubRecords.h>\r
 #include <Framework/FirmwareFileSystem.h>\r
 #include <Framework/FirmwareVolumeImageFormat.h>\r

diff --git a/IntelFrameworkPkg/Include/Guid/Capsule.h b/IntelFrameworkPkg/Include/Guid/Capsule.h
index 243586803384129bbd3a2f2c6c1a31ae7394bc97..858b290cc913bfb3a37ff7957a136a900ef9fee4 100644 (file)
--- a/IntelFrameworkPkg/Include/Guid/Capsule.h
+++ b/IntelFrameworkPkg/Include/Guid/Capsule.h
@@ -39,6 +39,50 @@
     0x98B8D59B, 0xE8BA, 0x48EE, {0x98, 0xDD, 0xC2, 0x95, 0x39, 0x2F, 0x1E, 0xDB } \\r
   }\r
 \r
+//\r
+// Bits in the flags field of the capsule header\r
+//\r
+#define EFI_CAPSULE_HEADER_FLAG_SETUP 0x00000001  // supports setup changes\r
+\r
+\r
+#define CAPSULE_BLOCK_DESCRIPTOR_SIGNATURE  EFI_SIGNATURE_32 ('C', 'B', 'D', 'S')\r
+\r
+//\r
+// An array of these describe the blocks that make up a capsule for\r
+// a capsule update.\r
+//\r
+typedef struct {\r
+  UINT64                Length;     // length of the data block\r
+  EFI_PHYSICAL_ADDRESS  Data;       // physical address of the data block\r
+  UINT32                Signature;  // CBDS\r
+  UINT32                CheckSum;   // to sum this structure to 0\r
+} FRAMEWORK_EFI_CAPSULE_BLOCK_DESCRIPTOR;\r
+\r
+typedef struct {\r
+  EFI_GUID  OemGuid;\r
+  UINT32    HeaderSize;\r
+  //\r
+  // UINT8                       OemHdrData[];\r
+  //\r
+} EFI_CAPSULE_OEM_HEADER;\r
+\r
+typedef struct {\r
+  EFI_GUID  CapsuleGuid;\r
+  UINT32    HeaderSize;\r
+  UINT32    Flags;\r
+  UINT32    CapsuleImageSize;\r
+  UINT32    SequenceNumber;\r
+  EFI_GUID  InstanceId;\r
+  UINT32    OffsetToSplitInformation;\r
+  UINT32    OffsetToCapsuleBody;\r
+  UINT32    OffsetToOemDefinedHeader;\r
+  UINT32    OffsetToAuthorInformation;\r
+  UINT32    OffsetToRevisionInformation;\r
+  UINT32    OffsetToShortDescription;\r
+  UINT32    OffsetToLongDescription;\r
+  UINT32    OffsetToApplicableDevices;\r
+} FRAMEWORK_EFI_CAPSULE_HEADER;\r
+\r
 extern EFI_GUID gEfiCapsuleGuid;\r
 extern EFI_GUID gEfiConfigFileNameGuid;\r
 \r