1) Remove Protocol/AcpiS3Save.h from IntelFrameworkPkg, which should be defined in TianoModulePkg.

2) Move Crc32 GuidedSectionExtraction GUID definition to MdeModulePkg.
3) Move Protocol/FirmwareVolumeDispatch.h to MdeModulePkg.
4) Remove Protcol/GuidedSectionExtraction.h of IntelFrameworkPkg, since it has been introduced in PI.
5) Clean up PROTOCOL/PPI/GUID declaration in MdeModulePkg.dec, IntelFrameworkModulePkg.dec, IntelFrameworkPkg.dec to match package spec.


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

5 files changed, 1 insertions, 248 deletions

diff --git a/IntelFrameworkPkg/Include/Guid/StatusCodeDataTypeId.h b/IntelFrameworkPkg/Include/Guid/StatusCodeDataTypeId.h
index 90e18c35f1..00d2182484 100644
--- a/IntelFrameworkPkg/Include/Guid/StatusCodeDataTypeId.h
+++ b/IntelFrameworkPkg/Include/Guid/StatusCodeDataTypeId.h
@@ -68,7 +68,7 @@ extern EFI_GUID gEfiStatusCodeDataTypeDebugGuid;
 // Progress Code. User Defined Data Type Guid.

 //

 #define EFI_STATUS_CODE_DATA_TYPE_ERROR_GUID \

-  0xAB359CE3, 0x99B3, 0xAE18, { 0xC8, 0x9D, 0x95, 0xD3, 0xB0, 0x72, 0xE1, 0x9B } }

+  { 0xAB359CE3, 0x99B3, 0xAE18, { 0xC8, 0x9D, 0x95, 0xD3, 0xB0, 0x72, 0xE1, 0x9B } }

 

 extern EFI_GUID gEfiStatusCodeDataTypeErrorGuid;

 

diff --git a/IntelFrameworkPkg/Include/Protocol/AcpiS3Save.h b/IntelFrameworkPkg/Include/Protocol/AcpiS3Save.h
deleted file mode 100644
index a9845e99dc..0000000000
--- a/IntelFrameworkPkg/Include/Protocol/AcpiS3Save.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*++

-

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

-

-  AcpiS3Save.h

-

-Abstract:

-

-

---*/

-

-#ifndef _ACPI_S3_SAVE_PROTOCOL_H

-#define _ACPI_S3_SAVE_PROTOCOL_H

-

-#include <PiDxe.h>

-

-//

-// Forward reference for pure ANSI compatability

-//

-typedef struct _EFI_ACPI_S3_SAVE_PROTOCOL EFI_ACPI_S3_SAVE_PROTOCOL;

-

-//

-// S3 Save Protocol GUID

-//

-#define EFI_ACPI_S3_SAVE_GUID \

-  { \

-    0x125f2de1, 0xfb85, 0x440c, {0xa5, 0x4c, 0x4d, 0x99, 0x35, 0x8a, 0x8d, 0x38 } \

-  }

-

-//

-// Protocol Data Structures

-//

-typedef

-EFI_STATUS

-(EFIAPI *EFI_ACPI_S3_SAVE) (

-  IN EFI_ACPI_S3_SAVE_PROTOCOL      * This,

-  IN VOID                           * LegacyMemoryAddress

-  );

-

-typedef

-EFI_STATUS

-(EFIAPI *EFI_ACPI_GET_LEGACY_MEMORY_SIZE) (

-  IN  EFI_ACPI_S3_SAVE_PROTOCOL     * This,

-  OUT UINTN                         * Size

-);

-

-struct _EFI_ACPI_S3_SAVE_PROTOCOL {

-  EFI_ACPI_GET_LEGACY_MEMORY_SIZE   GetLegacyMemorySize;

-  EFI_ACPI_S3_SAVE                  S3Save;

-};

-

-extern EFI_GUID gEfiAcpiS3SaveProtocolGuid;

-

-#endif

diff --git a/IntelFrameworkPkg/Include/Protocol/Crc32GuidedSectionExtraction.h b/IntelFrameworkPkg/Include/Protocol/Crc32GuidedSectionExtraction.h
deleted file mode 100644
index 5c8b61ff4b..0000000000
--- a/IntelFrameworkPkg/Include/Protocol/Crc32GuidedSectionExtraction.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/** @file

-  This file declares GUIDed section extraction protocol.

-

-  This interface provides a means of decoding a GUID defined encapsulation

-  section. There may be multiple different GUIDs associated with the GUIDed

-  section extraction protocol. That is, all instances of the GUIDed section

-  extraction protocol must have the same interface structure.

-

-  Copyright (c) 2006, 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:  GuidedSectionExtraction.h

-

-  @par Revision Reference:

-  This protocol is defined in Firmware Volume Specification.

-  Version 0.9

-

-**/

-

-#ifndef __CRC32_GUIDED_SECTION_EXTRACTION_PROTOCOL_H__

-#define __CRC32_GUIDED_SECTION_EXTRACTION_PROTOCOL_H__

-

-#include <PiPei.h>

-

-//

-// Protocol GUID definition. Each GUIDed section extraction protocol has the

-// same interface but with different GUID. All the GUIDs is defined here.

-// May add multiple GUIDs here.

-//

-#define EFI_CRC32_GUIDED_SECTION_EXTRACTION_PROTOCOL_GUID \

-  { \

-    0xFC1BCDB0, 0x7D31, 0x49aa, {0x93, 0x6A, 0xA4, 0x60, 0x0D, 0x9D, 0xD0, 0x83 } \

-  }

-

-//

-// may add other GUID here

-//

-extern EFI_GUID gEfiCrc32GuidedSectionExtractionProtocolGuid;

-

-#endif

diff --git a/IntelFrameworkPkg/Include/Protocol/FirmwareVolumeDispatch.h b/IntelFrameworkPkg/Include/Protocol/FirmwareVolumeDispatch.h
deleted file mode 100644
index e976f37693..0000000000
--- a/IntelFrameworkPkg/Include/Protocol/FirmwareVolumeDispatch.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/** @file

-  This file declares Firmware Volume Dispatch protocol.

-

-  Presence of this protocol tells the dispatch to dispatch from this Firmware

-  Volume

-

-  Copyright (c) 2006, 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:  FirmwareVolumeDispatch.h

-

-  @par Revision Reference:

-  This protol will be defined in DXE CIS Spec.

-  Version 0.91C.

-

-**/

-

-#ifndef __FIRMWARE_VOLUME_DISPATCH_H__

-#define __FIRMWARE_VOLUME_DISPATCH_H__

-

-#include <PiDxe.h>

-

-#define EFI_FIRMWARE_VOLUME_DISPATCH_PROTOCOL_GUID \

-  { 0x7aa35a69, 0x506c, 0x444f, {0xa7, 0xaf, 0x69, 0x4b, 0xf5, 0x6f, 0x71, 0xc8 } }

-

-

-extern EFI_GUID gEfiFirmwareVolumeDispatchProtocolGuid;

-

-#endif

diff --git a/IntelFrameworkPkg/Include/Protocol/GuidedSectionExtraction.h b/IntelFrameworkPkg/Include/Protocol/GuidedSectionExtraction.h
deleted file mode 100644
index 0bf6efc315..0000000000
--- a/IntelFrameworkPkg/Include/Protocol/GuidedSectionExtraction.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/** @file

-  This file declares GUIDed section extraction protocol.

-

-  This interface provides a means of decoding a GUID defined encapsulation

-  section. There may be multiple different GUIDs associated with the GUIDed

-  section extraction protocol. That is, all instances of the GUIDed section

-  extraction protocol must have the same interface structure.

-

-  Copyright (c) 2006, 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:  GuidedSectionExtraction.h

-

-  @par Revision Reference:

-  This protocol is defined in Firmware Volume Specification.

-  Version 0.9

-

-**/

-

-#ifndef __GUIDED_SECTION_EXTRACTION_PROTOCOL_H__

-#define __GUIDED_SECTION_EXTRACTION_PROTOCOL_H__

-

-#include <PiDxe.h>

-

-//

-// Protocol GUID definition. Each GUIDed section extraction protocol has the

-// same interface but with different GUID. All the GUIDs is defined here.

-// May add multiple GUIDs here.

-//

-#define EFI_CRC32_GUIDED_SECTION_EXTRACTION_PROTOCOL_GUID \

-  { \

-    0xFC1BCDB0, 0x7D31, 0x49aa, {0x93, 0x6A, 0xA4, 0x60, 0x0D, 0x9D, 0xD0, 0x83 } \

-  }

-

-//

-// Forward reference for pure ANSI compatability

-//

-typedef struct _EFI_GUIDED_SECTION_EXTRACTION_PROTOCOL  EFI_GUIDED_SECTION_EXTRACTION_PROTOCOL;

-

-//

-// Protocol member functions

-//

-/**

-  Processes the input section and returns the data contained therein along

-  with the authentication status.

-

-  @param  This                  Indicates the EFI_GUIDED_SECTION_EXTRACTION_PROTOCOL instance.

-  @param  InputSection          Buffer containing the input GUIDed section to be processed.

-  @param  OutputBuffer          *OutputBuffer is allocated from boot services pool memory

-                                and contains the new section stream.

-  @param  OutputSize            A pointer to a caller-allocated UINTN in which the size

-                                of *OutputBuffer allocation is stored.

-  @param  AuthenticationStatus  A pointer to a caller-allocated UINT32 that

-                                indicates the authentication status of the output buffer.

-

-  @retval EFI_SUCCESS           The InputSection was successfully processed and the

-                                section contents were returned.

-  @retval EFI_OUT_OF_RESOURCES  The system has insufficient resources to

-                                process the request.

-  @retval EFI_INVALID_PARAMETER The GUID in InputSection does not match

-                                this instance of the GUIDed Section Extraction Protocol.

-

-**/

-

-typedef

-EFI_STATUS

-(EFIAPI *EFI_EXTRACT_GUIDED_SECTION) (

-  IN  EFI_GUIDED_SECTION_EXTRACTION_PROTOCOL          *This,

-  IN  VOID                                            *InputSection,

-  OUT VOID                                            **OutputBuffer,

-  OUT UINTN                                           *OutputSize,

-  OUT UINT32                                          *AuthenticationStatus

-  );

-

-//

-// Protocol definition

-//

-/**

-  @par Protocol Description:

-  If a GUID-defined section is encountered when doing section extraction,

-  the section extraction driver calls the appropriate instance of the GUIDed

-  Section Extraction Protocol to extract the section stream contained therein.

-

-  @param ExtractSection

-  Takes the GUIDed section as input and produces the section stream data.

-

-**/

-struct _EFI_GUIDED_SECTION_EXTRACTION_PROTOCOL {

-  EFI_EXTRACT_GUIDED_SECTION  ExtractSection;

-};

-

-//

-// may add other GUID here

-//

-extern EFI_GUID gEfiCrc32GuidedSectionExtractionProtocolGuid;

-

-#endif