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

8 files changed, 51 insertions, 47 deletions

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.