diff options
author | bxing <bxing@6f19259b-4bc3-4df7-8a09-765794883524> | 2007-06-28 12:23:11 +0000 |
---|---|---|
committer | bxing <bxing@6f19259b-4bc3-4df7-8a09-765794883524> | 2007-06-28 12:23:11 +0000 |
commit | b80fbe8543eb535e40172a263b6b5d633e5b282c (patch) | |
tree | c77a3b777b6abf37fb9662eaa9e073a505926147 | |
parent | f29ae5d6b820bcb9bed7be78799e1b0a432188df (diff) | |
download | edk2-b80fbe8543eb535e40172a263b6b5d633e5b282c.tar.gz edk2-b80fbe8543eb535e40172a263b6b5d633e5b282c.tar.bz2 edk2-b80fbe8543eb535e40172a263b6b5d633e5b282c.zip |
Modified header files to make them compile
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2846 6f19259b-4bc3-4df7-8a09-765794883524
60 files changed, 211 insertions, 150 deletions
diff --git a/IntelFrameworkPkg/Include/Common/DataHubRecords.h b/IntelFrameworkPkg/Include/Common/DataHubRecords.h index bac5915361..cd7fe979cb 100644 --- a/IntelFrameworkPkg/Include/Common/DataHubRecords.h +++ b/IntelFrameworkPkg/Include/Common/DataHubRecords.h @@ -24,6 +24,9 @@ #ifndef _DATAHUB_RECORDS_H_
#define _DATAHUB_RECORDS_H_
+#include <PiPei.h>
+#include <Protocol/DevicePath.h>
+
#define EFI_PROCESSOR_SUBCLASS_VERSION 0x00010000
#include <Protocol/DevicePath.h>
diff --git a/IntelFrameworkPkg/Include/Common/FrameworkDxeCis.h b/IntelFrameworkPkg/Include/Common/FrameworkDxeCis.h index 08af44fe9f..0b7ffdf0a8 100644 --- a/IntelFrameworkPkg/Include/Common/FrameworkDxeCis.h +++ b/IntelFrameworkPkg/Include/Common/FrameworkDxeCis.h @@ -22,8 +22,19 @@ #define _FRAMEWORK_DXE_CIS_H_
#include <PiDxe.h>
+#include <Common/FrameworkStatusCode.h>
#include <Protocol/StatusCode.h>
+//
+// Function prototype for invoking a function on an Application Processor
+// Used by both the SMM infrastructure and the MP Services Protocol
+//
+typedef
+VOID
+(EFIAPI *EFI_AP_PROCEDURE) (
+ IN VOID *Buffer
+ );
+
typedef struct {
EFI_TABLE_HEADER Hdr;
diff --git a/IntelFrameworkPkg/Include/Common/FrameworkFirmwareFileSystem.h b/IntelFrameworkPkg/Include/Common/FrameworkFirmwareFileSystem.h index 21f100398b..c0acbc98f0 100644 --- a/IntelFrameworkPkg/Include/Common/FrameworkFirmwareFileSystem.h +++ b/IntelFrameworkPkg/Include/Common/FrameworkFirmwareFileSystem.h @@ -20,7 +20,7 @@ #ifndef _FRAMEWORK_FIRMWARE_FILE_SYSTEM_H_
#define _FRAMEWORK_FIRMWARE_FILE_SYSTEM_H_
-#include <PiFirmwareFile.h>
+#include <PiPei.h>
typedef UINT16 EFI_FFS_FILE_TAIL;
diff --git a/IntelFrameworkPkg/Include/Common/FrameworkHob.h b/IntelFrameworkPkg/Include/Common/FrameworkHob.h index 346c9543ff..cdc419d0ea 100644 --- a/IntelFrameworkPkg/Include/Common/FrameworkHob.h +++ b/IntelFrameworkPkg/Include/Common/FrameworkHob.h @@ -20,7 +20,7 @@ #ifndef _FRAMEWORK_HOB_H_
#define _FRAMEWORK_HOB_H_
-#include <PiHob.h>
+#include <PiPei.h>
//
// Capsule volume HOB -- identical to a firmware volume
diff --git a/IntelFrameworkPkg/Include/Common/FrameworkLegacy16.h b/IntelFrameworkPkg/Include/Common/FrameworkLegacy16.h index fc1eab8b0b..7f80c8ac72 100644 --- a/IntelFrameworkPkg/Include/Common/FrameworkLegacy16.h +++ b/IntelFrameworkPkg/Include/Common/FrameworkLegacy16.h @@ -30,6 +30,9 @@ //
#pragma pack(1)
+typedef UINT8 SERIAL_MODE;
+typedef UINT8 PARALLEL_MODE;
+
///////////////////////////////////////////////////////////////////////////////
// EFI_COMPATIBILITY16_TABLE is located at a 16-byte boundary starting with the
// signature "$EFI"
diff --git a/IntelFrameworkPkg/Include/Common/FrameworkSmmCis.h b/IntelFrameworkPkg/Include/Common/FrameworkSmmCis.h index 695a6a16c6..6fe8e662d9 100644 --- a/IntelFrameworkPkg/Include/Common/FrameworkSmmCis.h +++ b/IntelFrameworkPkg/Include/Common/FrameworkSmmCis.h @@ -20,7 +20,7 @@ #ifndef _FRAMEWORK_SMM_CIS_H_
#define _FRAMEWORK_SMM_CIS_H_
-#include <PiDxe.h>
+#include <Common/FrameworkDxeCis.h>
#define EFI_SMM_CPU_IO_GUID \
{ \
diff --git a/IntelFrameworkPkg/Include/Common/FrameworkStatusCode.h b/IntelFrameworkPkg/Include/Common/FrameworkStatusCode.h index dccb9510c0..6e997b679f 100644 --- a/IntelFrameworkPkg/Include/Common/FrameworkStatusCode.h +++ b/IntelFrameworkPkg/Include/Common/FrameworkStatusCode.h @@ -34,6 +34,7 @@ #ifndef _FRAMEWORK_STATUS_CODE_H_
#define _FRAMEWORK_STATUS_CODE_H_
+#include <PiPei.h>
//
// /////////////////////////////////////////////////////////////////////////////
diff --git a/IntelFrameworkPkg/Include/FrameworkBase.h b/IntelFrameworkPkg/Include/FrameworkBase.h deleted file mode 100644 index cf3fb25c56..0000000000 --- a/IntelFrameworkPkg/Include/FrameworkBase.h +++ /dev/null @@ -1,24 +0,0 @@ -/** @file
- Header file that supports Framework extension to UEFI for all types of
- modules.
-
- This header file must include Framework extension definitions common to all
- types of modules.
-
- 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: FrameworkBase.h
-
-**/
-
-#ifndef _FRAMEWORK_BASE_H_
-#define _FRAMEWORK_BASE_H_
-
-#endif
diff --git a/IntelFrameworkPkg/Include/FrameworkDxe.h b/IntelFrameworkPkg/Include/FrameworkDxe.h index 9a1206fdec..1d1c0ef140 100644 --- a/IntelFrameworkPkg/Include/FrameworkDxe.h +++ b/IntelFrameworkPkg/Include/FrameworkDxe.h @@ -20,16 +20,8 @@ #ifndef _FRAMEWORK_DXE_H_
#define _FRAMEWORK_DXE_H_
-#include <FrameworkBase.h>
-
+#include <FrameworkPei.h>
+#include <PiDxe.h>
#include <Common/FrameworkDxeCis.h>
-#include <Common/FrameworkFirmwareFileSystem.h>
-#include <Common/FrameworkHob.h>
-#include <Common/FrameworkLegacy16.h>
-#include <Common/DataHubRecords.h>
-
-#include <Common/FrameworkStatusCode.h>
-#include <Common/FrameworkStatusCodeDataTypeId.h>
-
#endif
diff --git a/IntelFrameworkPkg/Include/FrameworkPei.h b/IntelFrameworkPkg/Include/FrameworkPei.h index 8f36e9ee5e..0f630da726 100644 --- a/IntelFrameworkPkg/Include/FrameworkPei.h +++ b/IntelFrameworkPkg/Include/FrameworkPei.h @@ -20,14 +20,11 @@ #ifndef _FRAMEWORK_PEI_H_
#define _FRAMEWORK_PEI_H_
-#include <FrameworkBase.h>
#include <PiPei.h>
-
#include <Common/FrameworkFirmwareFileSystem.h>
#include <Common/FrameworkHob.h>
#include <Common/FrameworkLegacy16.h>
#include <Common/DataHubRecords.h>
-
#include <Common/FrameworkStatusCode.h>
#include <Common/FrameworkStatusCodeDataTypeId.h>
diff --git a/IntelFrameworkPkg/Include/Guid/AcpiTableStorage.h b/IntelFrameworkPkg/Include/Guid/AcpiTableStorage.h index 69a8bc0265..bf95981e20 100644 --- a/IntelFrameworkPkg/Include/Guid/AcpiTableStorage.h +++ b/IntelFrameworkPkg/Include/Guid/AcpiTableStorage.h @@ -22,6 +22,8 @@ #ifndef _ACPI_TABLE_STORAGE_H_
#define _ACPI_TABLE_STORAGE_H_
+#include <PiPei.h>
+
#define EFI_ACPI_TABLE_STORAGE_GUID \
{ 0x7e374e25, 0x8e01, 0x4fee, {0x87, 0xf2, 0x39, 0xc, 0x23, 0xc6, 0x6, 0xcd } }
diff --git a/IntelFrameworkPkg/Include/Guid/Capsule.h b/IntelFrameworkPkg/Include/Guid/Capsule.h index 64496668fa..2435868033 100644 --- a/IntelFrameworkPkg/Include/Guid/Capsule.h +++ b/IntelFrameworkPkg/Include/Guid/Capsule.h @@ -20,6 +20,8 @@ #ifndef _CAPSULE_GUID_H__
#define _CAPSULE_GUID_H__
+#include <PiPei.h>
+
//
// This is the GUID of the capsule header of the image on disk.
//
diff --git a/IntelFrameworkPkg/Include/Guid/DataHubRecords.h b/IntelFrameworkPkg/Include/Guid/DataHubRecords.h index f50a6d3ee4..0b022867bd 100644 --- a/IntelFrameworkPkg/Include/Guid/DataHubRecords.h +++ b/IntelFrameworkPkg/Include/Guid/DataHubRecords.h @@ -20,6 +20,8 @@ #ifndef _DATAHUB_RECORDS_GUID_H_
#define _DATAHUB_RECORDS_GUID_H_
+#include <PiPei.h>
+
#define EFI_PROCESSOR_PRODUCER_GUID \
{ 0x1bf06aea, 0x5bec, 0x4a8d, {0x95, 0x76, 0x74, 0x9b, 0x09, 0x56, 0x2d, 0x30 } }
diff --git a/IntelFrameworkPkg/Include/Guid/FrameworkDevicePath.h b/IntelFrameworkPkg/Include/Guid/FrameworkDevicePath.h index 81f8ff0a62..9e074cc0cb 100644 --- a/IntelFrameworkPkg/Include/Guid/FrameworkDevicePath.h +++ b/IntelFrameworkPkg/Include/Guid/FrameworkDevicePath.h @@ -21,6 +21,8 @@ #ifndef _FRAMEWORK_DEVICE_PATH_GUID_H_
#define _FRAMEWORK_DEVICE_PATH_GUID_H_
+#include <PiPei.h>
+
#define EFI_FRAMEWORK_DEVICE_PATH_GUID \
{ 0xb7084e63, 0x46b7, 0x4d1a, { 0x86, 0x77, 0xe3, 0x0b, 0x53, 0xdb, 0xf0, 0x50 } }
diff --git a/IntelFrameworkPkg/Include/Guid/SmmCommunicate.h b/IntelFrameworkPkg/Include/Guid/SmmCommunicate.h index 8d36fe9466..5856ad029c 100644 --- a/IntelFrameworkPkg/Include/Guid/SmmCommunicate.h +++ b/IntelFrameworkPkg/Include/Guid/SmmCommunicate.h @@ -21,6 +21,8 @@ #ifndef _SMM_COMMUNICATE_GUID_H_
#define _SMM_COMMUNICATE_GUID_H_
+#include <PiPei.h>
+
//******************************************************
// EFI_SMM_COMMUNICATE_HEADER
//******************************************************
diff --git a/IntelFrameworkPkg/Include/Guid/SmramMemoryReserve.h b/IntelFrameworkPkg/Include/Guid/SmramMemoryReserve.h index 680f0b93ae..d13119d45f 100644 --- a/IntelFrameworkPkg/Include/Guid/SmramMemoryReserve.h +++ b/IntelFrameworkPkg/Include/Guid/SmramMemoryReserve.h @@ -20,6 +20,8 @@ #ifndef _EFI_SMM_PEI_SMRAM_MEMORY_RESERVE_H_
#define _EFI_SMM_PEI_SMRAM_MEMORY_RESERVE_H_
+#include <PiPei.h>
+
#define EFI_SMM_PEI_SMRAM_MEMORY_RESERVE \
{ \
0x6dadf1d1, 0xd4cc, 0x4910, {0xbb, 0x6e, 0x82, 0xb1, 0xfd, 0x80, 0xff, 0x3d } \
diff --git a/IntelFrameworkPkg/Include/Guid/StatusCodeDataTypeId.h b/IntelFrameworkPkg/Include/Guid/StatusCodeDataTypeId.h index 9fa14ab625..90e18c35f1 100644 --- a/IntelFrameworkPkg/Include/Guid/StatusCodeDataTypeId.h +++ b/IntelFrameworkPkg/Include/Guid/StatusCodeDataTypeId.h @@ -20,6 +20,8 @@ #ifndef __STATUS_CODE_DATA_TYPE_ID_GUID_H__
#define __STATUS_CODE_DATA_TYPE_ID_GUID_H__
+#include <PiPei.h>
+
//
// String Data Type defintion. This is part of Status Code Specification
//
diff --git a/IntelFrameworkPkg/Include/Ppi/BlockIo.h b/IntelFrameworkPkg/Include/Ppi/BlockIo.h index df209f5ea3..5a366f0a60 100644 --- a/IntelFrameworkPkg/Include/Ppi/BlockIo.h +++ b/IntelFrameworkPkg/Include/Ppi/BlockIo.h @@ -21,6 +21,8 @@ #ifndef _PEI_BLOCK_IO_H_
#define _PEI_BLOCK_IO_H_
+#include <PiPei.h>
+
#define EFI_PEI_IDE_BLOCK_IO_PPI \
{ \
0x0964e5b22, 0x6459, 0x11d2, { 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \
diff --git a/IntelFrameworkPkg/Include/Ppi/BootScriptExecuter.h b/IntelFrameworkPkg/Include/Ppi/BootScriptExecuter.h index 1d249f01a5..28bc0e5e3f 100644 --- a/IntelFrameworkPkg/Include/Ppi/BootScriptExecuter.h +++ b/IntelFrameworkPkg/Include/Ppi/BootScriptExecuter.h @@ -21,6 +21,8 @@ #ifndef _PEI_BOOT_SCRIPT_EXECUTER_PPI_H
#define _PEI_BOOT_SCRIPT_EXECUTER_PPI_H
+#include <PiPei.h>
+
#define EFI_PEI_BOOT_SCRIPT_EXECUTER_PPI_GUID \
{ \
0xabd42895, 0x78cf, 0x4872, {0x84, 0x44, 0x1b, 0x5c, 0x18, 0x0b, 0xfb, 0xff } \
diff --git a/IntelFrameworkPkg/Include/Ppi/ReadOnlyVariable.h b/IntelFrameworkPkg/Include/Ppi/ReadOnlyVariable.h index ee00e14147..7c1c65470d 100644 --- a/IntelFrameworkPkg/Include/Ppi/ReadOnlyVariable.h +++ b/IntelFrameworkPkg/Include/Ppi/ReadOnlyVariable.h @@ -1,14 +1,14 @@ /** @file
This file declares Read-only Variable Service PPI
- 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
+ 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.
+ 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: ReadOnlyVariable.h
@@ -21,6 +21,8 @@ #ifndef __PEI_READ_ONLY_VARIABLE_PPI_H__
#define __PEI_READ_ONLY_VARIABLE_PPI_H__
+#include <PiPei.h>
+
#define EFI_PEI_READ_ONLY_VARIABLE_ACCESS_PPI_GUID \
{ \
0x3cdc90c6, 0x13fb, 0x4a75, {0x9e, 0x79, 0x59, 0xe9, 0xdd, 0x78, 0xb9, 0xfa } \
@@ -67,10 +69,10 @@ EFI_STATUS );
/**
- This function can be called multiple times to retrieve the VariableName
- and VendorGuid of all variables currently available in the system. On each call
- to GetNextVariableName() the previous results are passed into the interface,
- and on output the interface returns the next variable name data. When the
+ This function can be called multiple times to retrieve the VariableName
+ and VendorGuid of all variables currently available in the system. On each call
+ to GetNextVariableName() the previous results are passed into the interface,
+ and on output the interface returns the next variable name data. When the
entire variable list has been returned, the error EFI_NOT_FOUND is returned.
@param PeiServices An indirect pointer to the PEI Services Table published by the PEI Foundation.
@@ -100,8 +102,8 @@ EFI_STATUS /**
@par Ppi Description:
- This PPI provides a lightweight, read-only variant of the full EFI
- variable services.
+ This PPI provides a lightweight, read-only variant of the full EFI
+ variable services.
@param GetVariable
A service to ascertain a given variable name.
diff --git a/IntelFrameworkPkg/Include/Ppi/RecoveryModule.h b/IntelFrameworkPkg/Include/Ppi/RecoveryModule.h index 8136271366..02b71837fe 100644 --- a/IntelFrameworkPkg/Include/Ppi/RecoveryModule.h +++ b/IntelFrameworkPkg/Include/Ppi/RecoveryModule.h @@ -21,6 +21,8 @@ #ifndef __PEI_RECOVERY_MODULE_PPI_H__
#define __PEI_RECOVERY_MODULE_PPI_H__
+#include <PiPei.h>
+
#define EFI_PEI_RECOVERY_MODULE_PPI_GUID \
{ \
0xFB6D9542, 0x612D, 0x4f45, {0x87, 0x2F, 0x5C, 0xFF, 0x52, 0xE9, 0x3D, 0xCF } \
diff --git a/IntelFrameworkPkg/Include/Ppi/S3Resume.h b/IntelFrameworkPkg/Include/Ppi/S3Resume.h index d031018a7d..cbb38f5722 100644 --- a/IntelFrameworkPkg/Include/Ppi/S3Resume.h +++ b/IntelFrameworkPkg/Include/Ppi/S3Resume.h @@ -21,6 +21,8 @@ #ifndef __PEI_S3_RESUME_PPI_H__
#define __PEI_S3_RESUME_PPI_H__
+#include <PiPei.h>
+
#define EFI_PEI_S3_RESUME_PPI_GUID \
{ \
0x4426CCB2, 0xE684, 0x4a8a, {0xAE, 0x40, 0x20, 0xD4, 0xB0, 0x25, 0xB7, 0x10 } \
diff --git a/IntelFrameworkPkg/Include/Ppi/SectionExtraction.h b/IntelFrameworkPkg/Include/Ppi/SectionExtraction.h index fb95f6065a..e872bf78c9 100644 --- a/IntelFrameworkPkg/Include/Ppi/SectionExtraction.h +++ b/IntelFrameworkPkg/Include/Ppi/SectionExtraction.h @@ -1,14 +1,14 @@ /** @file
This file declares Section Extraction PPI.
- 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
+ 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.
+ 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: SectionExtraction.h
@@ -21,6 +21,8 @@ #ifndef __SECTION_EXTRACTION_PPI_H__
#define __SECTION_EXTRACTION_PPI_H__
+#include <PiPei.h>
+
#define EFI_PEI_SECTION_EXTRACTION_PPI_GUID \
{ \
0x4F89E208, 0xE144, 0x4804, {0x9E, 0xC8, 0x0F, 0x89, 0x4F, 0x7E, 0x36, 0xD7 } \
@@ -46,7 +48,7 @@ typedef struct _EFI_PEI_SECTION_EXTRACTION_PPI EFI_PEI_SECTION_EXTRACTION_PPI; @param SectionType Pointer to an EFI_SECTION_TYPE. If SectionType == NULL,
the contents of the entire section are returned in Buffer. If SectionType
is not NULL, only the requested section is returned.
- @param SectionDefinitionGuid
+ @param SectionDefinitionGuid
Pointer to an EFI_GUID.
If SectionType == EFI_SECTION_GUID_DEFINED, SectionDefinitionGuid
indicates for which section GUID to search.
@@ -59,7 +61,7 @@ typedef struct _EFI_PEI_SECTION_EXTRACTION_PPI EFI_PEI_SECTION_EXTRACTION_PPI; @param BufferSize A pointer to a caller-allocated UINT32.On input, *BufferSize
indicates the size in bytes of the memory region pointed to by Buffer.On output,
*BufferSize contains the number of bytes required to read the section.
- @param AuthenticationStatus
+ @param AuthenticationStatus
A pointer to a caller-allocated UINT32 in
which any metadata from encapsulating GUID-defined sections is returned.
@@ -92,7 +94,7 @@ EFI_STATUS /**
@par Ppi Description:
- This PPI supports encapsulating sections, such as GUIDed sections used to
+ This PPI supports encapsulating sections, such as GUIDed sections used to
authenticate the file encapsulation of other domain-specific wrapping.
@param GetSection
diff --git a/IntelFrameworkPkg/Include/Ppi/Security.h b/IntelFrameworkPkg/Include/Ppi/Security.h index 0be9b4a32d..4656e57774 100644 --- a/IntelFrameworkPkg/Include/Ppi/Security.h +++ b/IntelFrameworkPkg/Include/Ppi/Security.h @@ -1,14 +1,14 @@ /** @file
This file declares Security Architectural PPI.
- 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
+ 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.
+ 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: Security.h
@@ -21,6 +21,8 @@ #ifndef __SECURITY_PPI_H__
#define __SECURITY_PPI_H__
+#include <PiPei.h>
+
#define EFI_PEI_SECURITY_PPI_GUID \
{ \
0x1388066e, 0x3a57, 0x4efa, {0x98, 0xf3, 0xc1, 0x2f, 0x3a, 0x95, 0x8a, 0x29 } \
@@ -29,12 +31,12 @@ typedef struct _EFI_PEI_SECURITY_PPI EFI_PEI_SECURITY_PPI;
/**
- Allows the platform builder to implement a security policy in response
+ Allows the platform builder to implement a security policy in response
to varying file authentication states.
@param PeiServices Pointer to the PEI Services Table.
@param This Interface pointer that implements the particular EFI_PEI_SECURITY_PPI instance.
- @param AuthenticationStatus
+ @param AuthenticationStatus
Status returned by the verification service as part of section extraction.
@param FfsFileHeader Pointer to the file under review.
@param DeferExecution Pointer to a variable that alerts the PEI Foundation to defer execution of a PEIM.
@@ -55,12 +57,12 @@ EFI_STATUS /**
@par Ppi Description:
- This PPI is installed by some platform PEIM that abstracts the security
- policy to the PEI Foundation, namely the case of a PEIM's authentication
- state being returned during the PEI section extraction process.
+ This PPI is installed by some platform PEIM that abstracts the security
+ policy to the PEI Foundation, namely the case of a PEIM's authentication
+ state being returned during the PEI section extraction process.
@param AuthenticationState
- Allows the platform builder to implement a security policy in response
+ Allows the platform builder to implement a security policy in response
to varying file authentication states.
**/
diff --git a/IntelFrameworkPkg/Include/Ppi/Smbus.h b/IntelFrameworkPkg/Include/Ppi/Smbus.h index 54e6f58963..d530d0d689 100644 --- a/IntelFrameworkPkg/Include/Ppi/Smbus.h +++ b/IntelFrameworkPkg/Include/Ppi/Smbus.h @@ -21,6 +21,7 @@ #ifndef _PEI_SMBUS_PPI_H
#define _PEI_SMBUS_PPI_H
+#include <PiPei.h>
#include <IndustryStandard/SmBus.h>
#define EFI_PEI_SMBUS_PPI_GUID \
@@ -76,17 +77,6 @@ EFI_STATUS IN OUT VOID *Buffer
);
-typedef struct {
- UINT32 VendorSpecificId;
- UINT16 SubsystemDeviceId;
- UINT16 SubsystemVendorId;
- UINT16 Interface;
- UINT16 DeviceId;
- UINT16 VendorId;
- UINT8 VendorRevision;
- UINT8 DeviceCapabilities;
-} EFI_SMBUS_UDID;
-
/**
CallBack function can be registered in EFI_PEI_SMBUS_PPI_NOTIFY.
diff --git a/IntelFrameworkPkg/Include/Protocol/AcpiS3Save.h b/IntelFrameworkPkg/Include/Protocol/AcpiS3Save.h index 1571e3dcd2..a9845e99dc 100644 --- a/IntelFrameworkPkg/Include/Protocol/AcpiS3Save.h +++ b/IntelFrameworkPkg/Include/Protocol/AcpiS3Save.h @@ -1,13 +1,13 @@ /*++
-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.
+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:
@@ -15,12 +15,14 @@ Module Name: Abstract:
-
+
--*/
#ifndef _ACPI_S3_SAVE_PROTOCOL_H
#define _ACPI_S3_SAVE_PROTOCOL_H
+#include <PiDxe.h>
+
//
// Forward reference for pure ANSI compatability
//
@@ -41,11 +43,11 @@ typedef EFI_STATUS
(EFIAPI *EFI_ACPI_S3_SAVE) (
IN EFI_ACPI_S3_SAVE_PROTOCOL * This,
- IN VOID * LegacyMemoryAddress
+ IN VOID * LegacyMemoryAddress
);
-typedef
-EFI_STATUS
+typedef
+EFI_STATUS
(EFIAPI *EFI_ACPI_GET_LEGACY_MEMORY_SIZE) (
IN EFI_ACPI_S3_SAVE_PROTOCOL * This,
OUT UINTN * Size
diff --git a/IntelFrameworkPkg/Include/Protocol/AcpiSupport.h b/IntelFrameworkPkg/Include/Protocol/AcpiSupport.h index b0fa68ead7..8955e8e028 100644 --- a/IntelFrameworkPkg/Include/Protocol/AcpiSupport.h +++ b/IntelFrameworkPkg/Include/Protocol/AcpiSupport.h @@ -20,6 +20,8 @@ #ifndef _ACPI_SUPPORT_PROTOCOL_H_
#define _ACPI_SUPPORT_PROTOCOL_H_
+#include <PiDxe.h>
+
typedef struct _EFI_ACPI_SUPPORT_PROTOCOL EFI_ACPI_SUPPORT_PROTOCOL;
//
diff --git a/IntelFrameworkPkg/Include/Protocol/BootScriptSave.h b/IntelFrameworkPkg/Include/Protocol/BootScriptSave.h index fc34723bdc..f002b60e39 100644 --- a/IntelFrameworkPkg/Include/Protocol/BootScriptSave.h +++ b/IntelFrameworkPkg/Include/Protocol/BootScriptSave.h @@ -20,6 +20,8 @@ #ifndef _BOOT_SCRIPT_SAVE_PROTOCOL_H
#define _BOOT_SCRIPT_SAVE_PROTOCOL_H
+#include <PiDxe.h>
+
//
// S3 Save Protocol GUID
//
diff --git a/IntelFrameworkPkg/Include/Protocol/CpuIo.h b/IntelFrameworkPkg/Include/Protocol/CpuIo.h index 38f910ea94..f6c91df9bd 100644 --- a/IntelFrameworkPkg/Include/Protocol/CpuIo.h +++ b/IntelFrameworkPkg/Include/Protocol/CpuIo.h @@ -21,6 +21,8 @@ #ifndef _CPUIO_H_
#define _CPUIO_H_
+#include <PiDxe.h>
+
#define EFI_CPU_IO_PROTOCOL_GUID \
{ \
0xB0732526, 0x38C8, 0x4b40, {0x88, 0x77, 0x61, 0xC7, 0xB0, 0x6A, 0xAC, 0x45 } \
diff --git a/IntelFrameworkPkg/Include/Protocol/Crc32GuidedSectionExtraction.h b/IntelFrameworkPkg/Include/Protocol/Crc32GuidedSectionExtraction.h index f6f156a6ea..5c8b61ff4b 100644 --- a/IntelFrameworkPkg/Include/Protocol/Crc32GuidedSectionExtraction.h +++ b/IntelFrameworkPkg/Include/Protocol/Crc32GuidedSectionExtraction.h @@ -1,19 +1,19 @@ /** @file
This file declares GUIDed section extraction protocol.
- This interface provides a means of decoding a GUID defined encapsulation
+ 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
+ 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.
+ 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
@@ -26,6 +26,7 @@ #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
diff --git a/IntelFrameworkPkg/Include/Protocol/DataHub.h b/IntelFrameworkPkg/Include/Protocol/DataHub.h index 8af09641ee..a7ea34851e 100644 --- a/IntelFrameworkPkg/Include/Protocol/DataHub.h +++ b/IntelFrameworkPkg/Include/Protocol/DataHub.h @@ -26,6 +26,8 @@ #ifndef _DATA_HUB_H_
#define _DATA_HUB_H_
+#include <PiDxe.h>
+
#define EFI_DATA_HUB_PROTOCOL_GUID \
{ \
0xae80d021, 0x618e, 0x11d4, {0xbc, 0xd7, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81 } \
diff --git a/IntelFrameworkPkg/Include/Protocol/FirmwareVolume.h b/IntelFrameworkPkg/Include/Protocol/FirmwareVolume.h index 50c53d5e2e..d8fa30bd42 100644 --- a/IntelFrameworkPkg/Include/Protocol/FirmwareVolume.h +++ b/IntelFrameworkPkg/Include/Protocol/FirmwareVolume.h @@ -21,6 +21,7 @@ #ifndef _FIRMWARE_VOLUME_H_
#define _FIRMWARE_VOLUME_H_
+#include <PiDxe.h>
//
// Firmware Volume Protocol GUID definition
diff --git a/IntelFrameworkPkg/Include/Protocol/FirmwareVolumeBlock.h b/IntelFrameworkPkg/Include/Protocol/FirmwareVolumeBlock.h index f397f5935d..04d5baafb7 100644 --- a/IntelFrameworkPkg/Include/Protocol/FirmwareVolumeBlock.h +++ b/IntelFrameworkPkg/Include/Protocol/FirmwareVolumeBlock.h @@ -24,6 +24,7 @@ #ifndef _FIRMWARE_VOLUME_BLOCK_H_
#define _FIRMWARE_VOLUME_BLOCK_H_
+#include <PiDxe.h>
#define EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL_GUID \
{ \
diff --git a/IntelFrameworkPkg/Include/Protocol/FirmwareVolumeDispatch.h b/IntelFrameworkPkg/Include/Protocol/FirmwareVolumeDispatch.h index 249a476b77..e976f37693 100644 --- a/IntelFrameworkPkg/Include/Protocol/FirmwareVolumeDispatch.h +++ b/IntelFrameworkPkg/Include/Protocol/FirmwareVolumeDispatch.h @@ -1,17 +1,17 @@ /** @file
This file declares Firmware Volume Dispatch protocol.
- Presence of this protocol tells the dispatch to dispatch from this Firmware
+ 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
+ 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.
+ 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
@@ -24,6 +24,8 @@ #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 } }
diff --git a/IntelFrameworkPkg/Include/Protocol/FormCallback.h b/IntelFrameworkPkg/Include/Protocol/FormCallback.h index 8845864be3..74029137cc 100644 --- a/IntelFrameworkPkg/Include/Protocol/FormCallback.h +++ b/IntelFrameworkPkg/Include/Protocol/FormCallback.h @@ -1,18 +1,18 @@ /** @file
- The EFI_FORM_CALLBACK_PROTOCOL is the defined interface for access to custom
- NV storage devices as well as communication of user selections in a more
- interactive environment. This protocol should be published by hardware
- specific drivers which want to export access to custom hardware storage or
+ The EFI_FORM_CALLBACK_PROTOCOL is the defined interface for access to custom
+ NV storage devices as well as communication of user selections in a more
+ interactive environment. This protocol should be published by hardware
+ specific drivers which want to export access to custom hardware storage or
publish IFR which has a requirement to call back the original driver.
- 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
+ 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.
+ 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: FormCallback.h
@@ -24,6 +24,7 @@ #ifndef __FORM_CALLBACK_H__
#define __FORM_CALLBACK_H__
+#include <PiDxe.h>
#define EFI_FORM_CALLBACK_PROTOCOL_GUID \
{ \
@@ -86,7 +87,7 @@ typedef struct { // The following types are currently defined:
//
/**
- Returns the value of a variable.
+ Returns the value of a variable.
@param This A pointer to the EFI_FORM_CALLBACK_PROTOCOL instance.
@param VariableName A NULL-terminated Unicode string that is the
@@ -118,7 +119,7 @@ EFI_STATUS );
/**
- Sets the value of a variable.
+ Sets the value of a variable.
@param This A pointer to the EFI_FORM_CALLBACK_PROTOCOL instance.
@param VariableName A NULL-terminated Unicode string that is the
@@ -155,7 +156,7 @@ EFI_STATUS );
/**
- This function is called to provide results data to the driver.
+ This function is called to provide results data to the driver.
@param This A pointer to the EFI_FORM_CALLBACK_PROTOCOL instance.
@param KeyValue A unique value which is sent to the original exporting
@@ -179,10 +180,10 @@ EFI_STATUS /**
@par Protocol Description:
- The EFI_FORM_CALLBACK_PROTOCOL is the defined interface for access to
- custom NVS devices as well as communication of user selections in a more
- interactive environment. This protocol should be published by hardware-specific
- drivers that want to export access to custom hardware storage or publish IFR
+ The EFI_FORM_CALLBACK_PROTOCOL is the defined interface for access to
+ custom NVS devices as well as communication of user selections in a more
+ interactive environment. This protocol should be published by hardware-specific
+ drivers that want to export access to custom hardware storage or publish IFR
that has a requirement to call back the original driver.
@param NvRead
@@ -192,7 +193,7 @@ EFI_STATUS The write operation to access the NV data serviced by a hardware-specific driver.
@param Callback
- The function that is called from the configuration browser to communicate key value pairs.
+ The function that is called from the configuration browser to communicate key value pairs.
**/
struct _EFI_FORM_CALLBACK_PROTOCOL {
diff --git a/IntelFrameworkPkg/Include/Protocol/FrameworkHii.h b/IntelFrameworkPkg/Include/Protocol/FrameworkHii.h index 0cb71eb59b..ae3d3799d8 100644 --- a/IntelFrameworkPkg/Include/Protocol/FrameworkHii.h +++ b/IntelFrameworkPkg/Include/Protocol/FrameworkHii.h @@ -22,6 +22,8 @@ #ifndef _FRAMEWORK_HII_H_
#define _FRAMEWORK_HII_H_
+#include <PiDxe.h>
+
//
// To get EFI_GRAPHICS_OUTPUT_BLT_PIXEL,
// is defined in MdePkg/Protocol/GraphicsOutput.h
diff --git a/IntelFrameworkPkg/Include/Protocol/GuidedSectionExtraction.h b/IntelFrameworkPkg/Include/Protocol/GuidedSectionExtraction.h index 8368e281a8..0bf6efc315 100644 --- a/IntelFrameworkPkg/Include/Protocol/GuidedSectionExtraction.h +++ b/IntelFrameworkPkg/Include/Protocol/GuidedSectionExtraction.h @@ -1,19 +1,19 @@ /** @file
This file declares GUIDed section extraction protocol.
- This interface provides a means of decoding a GUID defined encapsulation
+ 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
+ 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.
+ 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
@@ -26,6 +26,7 @@ #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
@@ -46,7 +47,7 @@ typedef struct _EFI_GUIDED_SECTION_EXTRACTION_PROTOCOL EFI_GUIDED_SECTION_EXTRA // Protocol member functions
//
/**
- Processes the input section and returns the data contained therein along
+ 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.
@@ -57,7 +58,7 @@ typedef struct _EFI_GUIDED_SECTION_EXTRACTION_PROTOCOL EFI_GUIDED_SECTION_EXTRA 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
@@ -82,12 +83,12 @@ EFI_STATUS //
/**
@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
+ 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.
+ Takes the GUIDed section as input and produces the section stream data.
**/
struct _EFI_GUIDED_SECTION_EXTRACTION_PROTOCOL {
diff --git a/IntelFrameworkPkg/Include/Protocol/IdeControllerInit.h b/IntelFrameworkPkg/Include/Protocol/IdeControllerInit.h index 1f8b51589f..aef6a2ea26 100644 --- a/IntelFrameworkPkg/Include/Protocol/IdeControllerInit.h +++ b/IntelFrameworkPkg/Include/Protocol/IdeControllerInit.h @@ -21,6 +21,8 @@ #ifndef _EFI_IDE_CONTROLLER_INIT_PROTOCOL_H_
#define _EFI_IDE_CONTROLLER_INIT_PROTOCOL_H_
+#include <PiDxe.h>
+
//
// Global ID for the EFI Platform IDE Protocol GUID
//
diff --git a/IntelFrameworkPkg/Include/Protocol/IncompatiblePciDeviceSupport.h b/IntelFrameworkPkg/Include/Protocol/IncompatiblePciDeviceSupport.h index c684f15531..0c45fb7c27 100644 --- a/IntelFrameworkPkg/Include/Protocol/IncompatiblePciDeviceSupport.h +++ b/IntelFrameworkPkg/Include/Protocol/IncompatiblePciDeviceSupport.h @@ -21,6 +21,8 @@ #ifndef _INCOMPATIBLE_PCI_DEVICE_SUPPORT_H_
#define _INCOMPATIBLE_PCI_DEVICE_SUPPORT_H_
+#include <PiDxe.h>
+
#define EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL_GUID \
{0xeb23f55a, 0x7863, 0x4ac2, {0x8d, 0x3d, 0x95, 0x65, 0x35, 0xde, 0x03, 0x75} }
diff --git a/IntelFrameworkPkg/Include/Protocol/Legacy8259.h b/IntelFrameworkPkg/Include/Protocol/Legacy8259.h index e9f91733ef..ffd184c150 100644 --- a/IntelFrameworkPkg/Include/Protocol/Legacy8259.h +++ b/IntelFrameworkPkg/Include/Protocol/Legacy8259.h @@ -22,6 +22,8 @@ #ifndef _EFI_LEGACY_8259_H_
#define _EFI_LEGACY_8259_H_
+#include <PiDxe.h>
+
#define EFI_LEGACY_8259_PROTOCOL_GUID \
{ \
0x38321dba, 0x4fe0, 0x4e17, {0x8a, 0xec, 0x41, 0x30, 0x55, 0xea, 0xed, 0xc1 } \
diff --git a/IntelFrameworkPkg/Include/Protocol/LegacyBios.h b/IntelFrameworkPkg/Include/Protocol/LegacyBios.h index 1d11d95f39..0df87dbdc3 100644 --- a/IntelFrameworkPkg/Include/Protocol/LegacyBios.h +++ b/IntelFrameworkPkg/Include/Protocol/LegacyBios.h @@ -32,6 +32,8 @@ #ifndef _EFI_LEGACY_BIOS_H_
#define _EFI_LEGACY_BIOS_H_
+#include <FrameworkDxe.h>
+
#define EFI_LEGACY_BIOS_PROTOCOL_GUID \
{ \
0xdb9a1e3d, 0x45cb, 0x4abb, {0x85, 0x3b, 0xe5, 0x38, 0x7f, 0xdb, 0x2e, 0x2d } \
diff --git a/IntelFrameworkPkg/Include/Protocol/LegacyBiosPlatform.h b/IntelFrameworkPkg/Include/Protocol/LegacyBiosPlatform.h index 4eaa3dacba..3bc9f5d4ee 100644 --- a/IntelFrameworkPkg/Include/Protocol/LegacyBiosPlatform.h +++ b/IntelFrameworkPkg/Include/Protocol/LegacyBiosPlatform.h @@ -24,6 +24,8 @@ #ifndef _EFI_LEGACY_BIOS_PLATFORM_H_
#define _EFI_LEGACY_BIOS_PLATFORM_H_
+#include <FrameworkDxe.h>
+
#define EFI_LEGACY_BIOS_PLATFORM_PROTOCOL_GUID \
{ \
0x783658a3, 0x4172, 0x4421, {0xa2, 0x99, 0xe0, 0x9, 0x7, 0x9c, 0xc, 0xb4 } \
diff --git a/IntelFrameworkPkg/Include/Protocol/LegacyInterrupt.h b/IntelFrameworkPkg/Include/Protocol/LegacyInterrupt.h index 13ac36f31c..0ebbc5143a 100644 --- a/IntelFrameworkPkg/Include/Protocol/LegacyInterrupt.h +++ b/IntelFrameworkPkg/Include/Protocol/LegacyInterrupt.h @@ -21,6 +21,8 @@ #ifndef _EFI_LEGACY_INTERRUPT_H_
#define _EFI_LEGACY_INTERRUPT_H_
+#include <PiDxe.h>
+
#define EFI_LEGACY_INTERRUPT_PROTOCOL_GUID \
{ \
0x31ce593d, 0x108a, 0x485d, {0xad, 0xb2, 0x78, 0xf2, 0x1f, 0x29, 0x66, 0xbe } \
diff --git a/IntelFrameworkPkg/Include/Protocol/LegacyRegion.h b/IntelFrameworkPkg/Include/Protocol/LegacyRegion.h index ede3a6c90f..b819f80973 100644 --- a/IntelFrameworkPkg/Include/Protocol/LegacyRegion.h +++ b/IntelFrameworkPkg/Include/Protocol/LegacyRegion.h @@ -21,6 +21,8 @@ #ifndef _EFI_LEGACY_REGION_H_
#define _EFI_LEGACY_REGION_H_
+#include <PiDxe.h>
+
#define EFI_LEGACY_REGION_PROTOCOL_GUID \
{ \
0xfc9013a, 0x568, 0x4ba9, {0x9b, 0x7e, 0xc9, 0xc3, 0x90, 0xa6, 0x60, 0x9b } \
diff --git a/IntelFrameworkPkg/Include/Protocol/PciHostBridgeResourceAllocation.h b/IntelFrameworkPkg/Include/Protocol/PciHostBridgeResourceAllocation.h index adafd734de..33b4c34d45 100644 --- a/IntelFrameworkPkg/Include/Protocol/PciHostBridgeResourceAllocation.h +++ b/IntelFrameworkPkg/Include/Protocol/PciHostBridgeResourceAllocation.h @@ -21,6 +21,7 @@ #ifndef _PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_H_
#define _PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_H_
+#include <PiDxe.h>
#include <Protocol/PciRootBridgeIo.h>
#define EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL_GUID \
diff --git a/IntelFrameworkPkg/Include/Protocol/PciHotPlugInit.h b/IntelFrameworkPkg/Include/Protocol/PciHotPlugInit.h index 577a4dd430..177245041b 100644 --- a/IntelFrameworkPkg/Include/Protocol/PciHotPlugInit.h +++ b/IntelFrameworkPkg/Include/Protocol/PciHotPlugInit.h @@ -21,6 +21,8 @@ #ifndef _EFI_PCI_HOT_PLUG_INIT_H_
#define _EFI_PCI_HOT_PLUG_INIT_H_
+#include <PiDxe.h>
+
//
// Global ID for the PCI Hot Plug Protocol
//
diff --git a/IntelFrameworkPkg/Include/Protocol/PciPlatform.h b/IntelFrameworkPkg/Include/Protocol/PciPlatform.h index f86ea51beb..87a02889ee 100644 --- a/IntelFrameworkPkg/Include/Protocol/PciPlatform.h +++ b/IntelFrameworkPkg/Include/Protocol/PciPlatform.h @@ -21,6 +21,9 @@ #ifndef _PCI_PLATFORM_H_
#define _PCI_PLATFORM_H_
+#include <PiDxe.h>
+#include <Protocol/PciHostBridgeResourceAllocation.h>
+
//
// Protocol for GUID.
//
diff --git a/IntelFrameworkPkg/Include/Protocol/SectionExtraction.h b/IntelFrameworkPkg/Include/Protocol/SectionExtraction.h index 964cf4b771..cdf8f06c5c 100644 --- a/IntelFrameworkPkg/Include/Protocol/SectionExtraction.h +++ b/IntelFrameworkPkg/Include/Protocol/SectionExtraction.h @@ -24,6 +24,7 @@ #ifndef _SECTION_EXTRACTION_PROTOCOL_H_
#define _SECTION_EXTRACTION_PROTOCOL_H_
+#include <PiDxe.h>
//
// Protocol GUID definition
diff --git a/IntelFrameworkPkg/Include/Protocol/SmmAccess.h b/IntelFrameworkPkg/Include/Protocol/SmmAccess.h index 700eb25006..df7a87ed8b 100644 --- a/IntelFrameworkPkg/Include/Protocol/SmmAccess.h +++ b/IntelFrameworkPkg/Include/Protocol/SmmAccess.h @@ -20,7 +20,8 @@ #ifndef _SMM_ACCESS_H_
#define _SMM_ACCESS_H_
-#include <SmramMemoryReserve.h>
+#include <PiDxe.h>
+#include <Guid/SmramMemoryReserve.h>
typedef struct _EFI_SMM_ACCESS_PROTOCOL EFI_SMM_ACCESS_PROTOCOL;
diff --git a/IntelFrameworkPkg/Include/Protocol/SmmBase.h b/IntelFrameworkPkg/Include/Protocol/SmmBase.h index be214736f3..ab14f1c23b 100644 --- a/IntelFrameworkPkg/Include/Protocol/SmmBase.h +++ b/IntelFrameworkPkg/Include/Protocol/SmmBase.h @@ -22,6 +22,8 @@ #ifndef _SMM_BASE_H_
#define _SMM_BASE_H_
+#include <FrameworkSmm.h>
+
#define EFI_SMM_BASE_PROTOCOL_GUID \
{ \
0x1390954D, 0xda95, 0x4227, {0x93, 0x28, 0x72, 0x82, 0xc2, 0x17, 0xda, 0xa8 } \
diff --git a/IntelFrameworkPkg/Include/Protocol/SmmControl.h b/IntelFrameworkPkg/Include/Protocol/SmmControl.h index 51bc5bfad9..2dbf412ff7 100644 --- a/IntelFrameworkPkg/Include/Protocol/SmmControl.h +++ b/IntelFrameworkPkg/Include/Protocol/SmmControl.h @@ -21,6 +21,8 @@ #ifndef _SMM_CONTROL_H_
#define _SMM_CONTROL_H_
+#include <PiDxe.h>
+
typedef struct _EFI_SMM_CONTROL_PROTOCOL EFI_SMM_CONTROL_PROTOCOL;
#define EFI_SMM_CONTROL_PROTOCOL_GUID \
diff --git a/IntelFrameworkPkg/Include/Protocol/SmmGpiDispatch.h b/IntelFrameworkPkg/Include/Protocol/SmmGpiDispatch.h index 7454bcc685..c6cdf608f5 100644 --- a/IntelFrameworkPkg/Include/Protocol/SmmGpiDispatch.h +++ b/IntelFrameworkPkg/Include/Protocol/SmmGpiDispatch.h @@ -21,6 +21,8 @@ #ifndef _EFI_SMM_GPI_DISPATCH_H_
#define _EFI_SMM_GPI_DISPATCH_H_
+#include <PiDxe.h>
+
//
// Global ID for the GPI SMI Protocol
//
diff --git a/IntelFrameworkPkg/Include/Protocol/SmmIchnDispatch.h b/IntelFrameworkPkg/Include/Protocol/SmmIchnDispatch.h index 34185e88dc..e4bf7379a7 100644 --- a/IntelFrameworkPkg/Include/Protocol/SmmIchnDispatch.h +++ b/IntelFrameworkPkg/Include/Protocol/SmmIchnDispatch.h @@ -21,6 +21,8 @@ #ifndef _EFI_SMM_ICHN_DISPATCH_H_
#define _EFI_SMM_ICHN_DISPATCH_H_
+#include <PiDxe.h>
+
//
// Global ID for the ICH SMI Protocol
//
diff --git a/IntelFrameworkPkg/Include/Protocol/SmmPeriodicTimerDispatch.h b/IntelFrameworkPkg/Include/Protocol/SmmPeriodicTimerDispatch.h index 1f343a8e38..dbc05ed4b8 100644 --- a/IntelFrameworkPkg/Include/Protocol/SmmPeriodicTimerDispatch.h +++ b/IntelFrameworkPkg/Include/Protocol/SmmPeriodicTimerDispatch.h @@ -21,6 +21,8 @@ #ifndef _EFI_SMM_PERIODIC_TIMER_DISPATCH_H_
#define _EFI_SMM_PERIODIC_TIMER_DISPATCH_H_
+#include <PiDxe.h>
+
//
// Global ID for the Periodic Timer SMI Protocol
//
diff --git a/IntelFrameworkPkg/Include/Protocol/SmmPowerButtonDispatch.h b/IntelFrameworkPkg/Include/Protocol/SmmPowerButtonDispatch.h index c2c7b282f9..01b87c33b5 100644 --- a/IntelFrameworkPkg/Include/Protocol/SmmPowerButtonDispatch.h +++ b/IntelFrameworkPkg/Include/Protocol/SmmPowerButtonDispatch.h @@ -21,6 +21,8 @@ #ifndef _EFI_SMM_POWER_BUTTON_DISPATCH_H_
#define _EFI_SMM_POWER_BUTTON_DISPATCH_H_
+#include <PiDxe.h>
+
//
// Global ID for the Power Button SMI Protocol
//
diff --git a/IntelFrameworkPkg/Include/Protocol/SmmStandbyButtonDispatch.h b/IntelFrameworkPkg/Include/Protocol/SmmStandbyButtonDispatch.h index 8753808a37..3770154ca4 100644 --- a/IntelFrameworkPkg/Include/Protocol/SmmStandbyButtonDispatch.h +++ b/IntelFrameworkPkg/Include/Protocol/SmmStandbyButtonDispatch.h @@ -21,6 +21,8 @@ #ifndef _EFI_SMM_STANDBY_BUTTON_DISPATCH_H_
#define _EFI_SMM_STANDBY_BUTTON_DISPATCH_H_
+#include <PiDxe.h>
+
//
// Global ID for the Standby Button SMI Protocol
//
diff --git a/IntelFrameworkPkg/Include/Protocol/SmmSwDispatch.h b/IntelFrameworkPkg/Include/Protocol/SmmSwDispatch.h index e003fb74ef..cb82a3c087 100644 --- a/IntelFrameworkPkg/Include/Protocol/SmmSwDispatch.h +++ b/IntelFrameworkPkg/Include/Protocol/SmmSwDispatch.h @@ -21,6 +21,8 @@ #ifndef _EFI_SMM_SW_DISPATCH_H_
#define _EFI_SMM_SW_DISPATCH_H_
+#include <PiDxe.h>
+
//
// Global ID for the SW SMI Protocol
//
diff --git a/IntelFrameworkPkg/Include/Protocol/SmmSxDispatch.h b/IntelFrameworkPkg/Include/Protocol/SmmSxDispatch.h index e7621cdfe6..66f059463a 100644 --- a/IntelFrameworkPkg/Include/Protocol/SmmSxDispatch.h +++ b/IntelFrameworkPkg/Include/Protocol/SmmSxDispatch.h @@ -21,6 +21,8 @@ #ifndef _EFI_SMM_SX_DISPATCH_H_
#define _EFI_SMM_SX_DISPATCH_H_
+#include <PiDxe.h>
+
//
// Global ID for the Sx SMI Protocol
//
diff --git a/IntelFrameworkPkg/Include/Protocol/SmmUsbDispatch.h b/IntelFrameworkPkg/Include/Protocol/SmmUsbDispatch.h index e87619d938..741b0a1a7e 100644 --- a/IntelFrameworkPkg/Include/Protocol/SmmUsbDispatch.h +++ b/IntelFrameworkPkg/Include/Protocol/SmmUsbDispatch.h @@ -20,6 +20,8 @@ #ifndef _EFI_SMM_USB_DISPATCH_H_
#define _EFI_SMM_USB_DISPATCH_H_
+#include <PiDxe.h>
+
//
// Global ID for the USB Protocol
//
diff --git a/IntelFrameworkPkg/IntelFrameworkPkg.nspd b/IntelFrameworkPkg/IntelFrameworkPkg.nspd index 983b1d5aaa..3daeaa2602 100644 --- a/IntelFrameworkPkg/IntelFrameworkPkg.nspd +++ b/IntelFrameworkPkg/IntelFrameworkPkg.nspd @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<PackageSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<SpdHeader>
<PackageName>IntelFrameworkPkg</PackageName>
@@ -32,7 +32,6 @@ <Filename>Library/UefiLibFramework/UefiLib.msa</Filename>
</MsaFiles>
<PackageHeaders>
- <IncludePkgHeader ModuleType="BASE">Include/FrameworkBase.h</IncludePkgHeader>
<IncludePkgHeader ModuleType="PEIM">Include/FrameworkPei.h</IncludePkgHeader>
<IncludePkgHeader ModuleType="DXE_DRIVER">Include/FrameworkDxe.h</IncludePkgHeader>
<IncludePkgHeader ModuleType="DXE_RUNTIME_DRIVER">Include/FrameworkDxe.h</IncludePkgHeader>
|