From 1b144bbfe3aa7b7a3eea1ec6f24a62531d6cb0fb Mon Sep 17 00:00:00 2001
From: klu2 <klu2@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Fri, 10 Aug 2007 06:56:22 +0000
Subject: [PATCH 1/1] Move the definition of Capsule from
 IntelFrameworkPkg/Include/Framework/Capsule.h to
 IntelFrameworkPkg/Include/Guid/Capsule.h.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3605 6f19259b-4bc3-4df7-8a09-765794883524
---
 IntelFrameworkPkg/Include/Framework/Capsule.h | 69 -------------------
 IntelFrameworkPkg/Include/FrameworkPei.h      |  1 -
 IntelFrameworkPkg/Include/Guid/Capsule.h      | 44 ++++++++++++
 3 files changed, 44 insertions(+), 70 deletions(-)
 delete mode 100644 IntelFrameworkPkg/Include/Framework/Capsule.h

diff --git a/IntelFrameworkPkg/Include/Framework/Capsule.h b/IntelFrameworkPkg/Include/Framework/Capsule.h
deleted file mode 100644
index 84579343a4..0000000000
--- a/IntelFrameworkPkg/Include/Framework/Capsule.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/** @file
-  Defines for the EFI Capsule functionality.
-
-  Copyright (c) 2007, Intel Corporation
-  All rights reserved. This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-  Module Name:  Capsule.h
-
-  @par Revision Reference:
-  These definitions are from Capsule Spec Version 0.9.
-
-**/
-
-#ifndef _EFI_CAPSULE_H_
-#define _EFI_CAPSULE_H_
-
-#include <PiPei.h>
-
-//
-// Bits in the flags field of the capsule header
-//
-#define EFI_CAPSULE_HEADER_FLAG_SETUP 0x00000001  // supports setup changes
-
-
-#define CAPSULE_BLOCK_DESCRIPTOR_SIGNATURE  EFI_SIGNATURE_32 ('C', 'B', 'D', 'S')
-
-//
-// An array of these describe the blocks that make up a capsule for
-// a capsule update.
-//
-typedef struct {
-  UINT64                Length;     // length of the data block
-  EFI_PHYSICAL_ADDRESS  Data;       // physical address of the data block
-  UINT32                Signature;  // CBDS
-  UINT32                CheckSum;   // to sum this structure to 0
-} FRAMEWORK_EFI_CAPSULE_BLOCK_DESCRIPTOR;
-
-typedef struct {
-  EFI_GUID  OemGuid;
-  UINT32    HeaderSize;
-  //
-  // UINT8                       OemHdrData[];
-  //
-} EFI_CAPSULE_OEM_HEADER;
-
-typedef struct {
-  EFI_GUID  CapsuleGuid;
-  UINT32    HeaderSize;
-  UINT32    Flags;
-  UINT32    CapsuleImageSize;
-  UINT32    SequenceNumber;
-  EFI_GUID  InstanceId;
-  UINT32    OffsetToSplitInformation;
-  UINT32    OffsetToCapsuleBody;
-  UINT32    OffsetToOemDefinedHeader;
-  UINT32    OffsetToAuthorInformation;
-  UINT32    OffsetToRevisionInformation;
-  UINT32    OffsetToShortDescription;
-  UINT32    OffsetToLongDescription;
-  UINT32    OffsetToApplicableDevices;
-} FRAMEWORK_EFI_CAPSULE_HEADER;
-
-#endif // #ifndef _EFI_CAPSULE_H_
diff --git a/IntelFrameworkPkg/Include/FrameworkPei.h b/IntelFrameworkPkg/Include/FrameworkPei.h
index f7255bb4e8..93f2cc9798 100644
--- a/IntelFrameworkPkg/Include/FrameworkPei.h
+++ b/IntelFrameworkPkg/Include/FrameworkPei.h
@@ -22,7 +22,6 @@
 
 #include <PiPei.h>
 
-#include <Framework/Capsule.h>
 #include <Framework/DataHubRecords.h>
 #include <Framework/FirmwareFileSystem.h>
 #include <Framework/FirmwareVolumeImageFormat.h>
diff --git a/IntelFrameworkPkg/Include/Guid/Capsule.h b/IntelFrameworkPkg/Include/Guid/Capsule.h
index 2435868033..858b290cc9 100644
--- 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 } \
   }
 
+//
+// Bits in the flags field of the capsule header
+//
+#define EFI_CAPSULE_HEADER_FLAG_SETUP 0x00000001  // supports setup changes
+
+
+#define CAPSULE_BLOCK_DESCRIPTOR_SIGNATURE  EFI_SIGNATURE_32 ('C', 'B', 'D', 'S')
+
+//
+// An array of these describe the blocks that make up a capsule for
+// a capsule update.
+//
+typedef struct {
+  UINT64                Length;     // length of the data block
+  EFI_PHYSICAL_ADDRESS  Data;       // physical address of the data block
+  UINT32                Signature;  // CBDS
+  UINT32                CheckSum;   // to sum this structure to 0
+} FRAMEWORK_EFI_CAPSULE_BLOCK_DESCRIPTOR;
+
+typedef struct {
+  EFI_GUID  OemGuid;
+  UINT32    HeaderSize;
+  //
+  // UINT8                       OemHdrData[];
+  //
+} EFI_CAPSULE_OEM_HEADER;
+
+typedef struct {
+  EFI_GUID  CapsuleGuid;
+  UINT32    HeaderSize;
+  UINT32    Flags;
+  UINT32    CapsuleImageSize;
+  UINT32    SequenceNumber;
+  EFI_GUID  InstanceId;
+  UINT32    OffsetToSplitInformation;
+  UINT32    OffsetToCapsuleBody;
+  UINT32    OffsetToOemDefinedHeader;
+  UINT32    OffsetToAuthorInformation;
+  UINT32    OffsetToRevisionInformation;
+  UINT32    OffsetToShortDescription;
+  UINT32    OffsetToLongDescription;
+  UINT32    OffsetToApplicableDevices;
+} FRAMEWORK_EFI_CAPSULE_HEADER;
+
 extern EFI_GUID gEfiCapsuleGuid;
 extern EFI_GUID gEfiConfigFileNameGuid;
 
-- 
2.39.2