Move MdeModuleHii.h into Include\Guid directory

Move Capsule.h into MdePkg\Include\Protocol directory because Capsule is defined in PI1.0a.
Merge WorkingBlockHeader.h into SystemNvDataGuid.h
Remove unused NvDataFvHob.

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

4 files changed, 36 insertions, 103 deletions

diff --git a/MdeModulePkg/Include/MdeModuleHii.h b/MdeModulePkg/Include/Guid/MdeModuleHii.h
index 092cdaf310..e66a944c08 100644
--- a/MdeModulePkg/Include/MdeModuleHii.h
+++ b/MdeModulePkg/Include/Guid/MdeModuleHii.h
@@ -233,5 +233,8 @@ typedef struct _EFI_IFR_GUID_VAREQNAME {
 

 #pragma pack()

 

+extern EFI_GUID gEfiIfrTianoGuid;

+extern EFI_GUID gEfiIfrFrameworkGuid;

+

 #endif

 

diff --git a/MdeModulePkg/Include/Guid/SystemNvDataGuid.h b/MdeModulePkg/Include/Guid/SystemNvDataGuid.h
index 583f7a30bf..048ea651da 100644
--- a/MdeModulePkg/Include/Guid/SystemNvDataGuid.h
+++ b/MdeModulePkg/Include/Guid/SystemNvDataGuid.h
@@ -1,10 +1,5 @@
-/** @file

-  This file defines NvData Hob GUIDs for System Non Volatile HOB entries 

-  and the corresponding hob data structure. NvData Hob can be used to report 

-  the region of the system non volatile data for the specific purpose, 

-  such as FTW region, Error log region.

-  

-  It also defines NvDataFv GUID. 

+/** @file  

+  This file defines NvDataFv GUID and FTW working block structure header.

   This guid can be used as FileSystemGuid in EFI_FIRMWARE_VOLUME_HEADER if 

   this FV image contains NV data, such as NV variable data.

   This guid can also be used as the signature of FTW working block header.

@@ -26,27 +21,42 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define EFI_SYSTEM_NV_DATA_FV_GUID \

   {0xfff12b8d, 0x7696, 0x4c8b, {0xa9, 0x85, 0x27, 0x47, 0x7, 0x5b, 0x4f, 0x50} }

 

-#define EFI_SYSTEM_NV_DATA_HOB_GUID \

-  {0xd6e5092d, 0xc7b2, 0x4872, {0xaf, 0x66, 0xfd, 0xc0, 0xe6, 0xf9, 0x5e, 0x78} }

-

 ///

-/// Hob entry for NV data region

+/// NvDataFv GUID used as the signature of FTW working block header.

 ///

-typedef struct {

-  EFI_GUID                  SystemNvDataHobGuid; ///> EFI_SYSTEM_NV_DATA_HOB_GUID

-  EFI_GUID                  SystemNvDataFvGuid;  ///> Guid specifies the NvData Fv for the specific purpose, such as FTW, Error Log.

-  EFI_LBA                   StartLba;            ///> The starting logical block index.

-  UINTN                     StartLbaOffset;      ///> Offset into the starting block at which to the start of NvData region.

-  EFI_LBA                   EndLba;              ///> The last logical block index.

-  UINTN                     EndLbaOffset;        ///> Offset into the last block at which to the end of Nvdata region.

-  UINT32                    DataTypeSignature;   ///> NvData type in the specified NV range.

-} NV_SYSTEM_DATA_GUID_TYPE;

+extern EFI_GUID gEfiSystemNvDataFvGuid;

 

-extern EFI_GUID gEfiSystemNvDataHobGuid;

+#define WORKING_BLOCK_VALID   0x1

+#define WORKING_BLOCK_INVALID 0x2

 

 ///

-/// NvDataFv GUID used as the signature of FTW working block header.

+/// EDKII Fault tolerant working block header

+/// The header is immediately followed by the write queue data.

 ///

-extern EFI_GUID gEfiSystemNvDataFvGuid;

+typedef struct {

+  ///

+  /// System Non Volatile FV Guid

+  ///

+  EFI_GUID  Signature;

+  ///

+  /// 32bit CRC caculated for this header

+  ///

+  UINT32    Crc;

+  ///

+  /// Working block valid bit

+  ///

+  UINT8     WorkingBlockValid : 1;

+  UINT8     WorkingBlockInvalid : 1;

+  UINT8     Reserved : 6;

+  UINT8     Reserved3[3];

+  ///

+  /// Total size of the following write queue range.

+  ///

+  UINT64    WriteQueueSize;

+  ///

+  /// Write Queue data

+  /// UINT8                WriteQueue[WriteQueueSize];

+  ///

+} EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER;

 

 #endif

diff --git a/MdeModulePkg/Include/Protocol/Capsule.h b/MdeModulePkg/Include/Protocol/Capsule.h
deleted file mode 100644
index 192d9e7851..0000000000
--- a/MdeModulePkg/Include/Protocol/Capsule.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/** @file

-

-  Capsule Architectural Protocol is responsible to tag UEFI2.0 capsule runtime services

-  are ready in EFI_RUNTIME_SERVICES table.

-

-Copyright (c) 2006 - 2008, 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.

-

-**/

-

-#ifndef __ARCH_PROTOCOL_CAPSULE_ARCH_H__

-#define __ARCH_PROTOCOL_CAPSULE_ARCH_H__

-

-//

-// Global ID for the Capsule Architectural Protocol

-//

-#define EFI_CAPSULE_ARCH_PROTOCOL_GUID \

-  { 0x5053697e, 0x2cbc, 0x4819, {0x90, 0xd9, 0x05, 0x80, 0xde, 0xee, 0x57, 0x54 }}

-

-extern EFI_GUID gEfiCapsuleArchProtocolGuid;

-

-#endif

diff --git a/MdeModulePkg/Include/WorkingBlockHeader.h b/MdeModulePkg/Include/WorkingBlockHeader.h
deleted file mode 100644
index 4298d5fe18..0000000000
--- a/MdeModulePkg/Include/WorkingBlockHeader.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/** @file

-

-  The header structure of FTW working block region.

-

-Copyright (c) 2006 - 2008, 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.

-

-**/

-

-#ifndef __EFI_WORKING_BLOCK_HEADER_H__

-#define __EFI_WORKING_BLOCK_HEADER_H__

-

-#define WORKING_BLOCK_VALID   0x1

-#define WORKING_BLOCK_INVALID 0x2

-

-///

-/// EDKII Fault tolerant working block header

-/// The header is immediately followed by the write queue data.

-///

-typedef struct {

-  ///

-  /// System Non Volatile FV Guid

-  ///

-  EFI_GUID  Signature;

-  ///

-  /// 32bit CRC caculated for this header

-  ///

-  UINT32    Crc;

-  ///

-  /// Working block valid bit

-  ///

-  UINT8     WorkingBlockValid : 1;

-  UINT8     WorkingBlockInvalid : 1;

-  UINT8     Reserved : 6;

-  UINT8     Reserved3[3];

-  ///

-  /// Total size of the following write queue range.

-  ///

-  UINT64    WriteQueueSize;

-  ///

-  /// Write Queue data

-  /// UINT8                WriteQueue[WriteQueueSize];

-  ///

-} EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER;

-

-#endif