Remove the package header files PiDxe.h/PiPei.h/Uefi.h included by Protocol/Ppi/Guid header file

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6087 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
lgao4 2008-10-09 01:12:34 +00:00
parent 0856e61e18
commit 3909993808
23 changed files with 5 additions and 40 deletions

View File

@ -17,8 +17,6 @@
#ifndef __FIRMWARE_VOLUME_DISPATCH_H__ #ifndef __FIRMWARE_VOLUME_DISPATCH_H__
#define __FIRMWARE_VOLUME_DISPATCH_H__ #define __FIRMWARE_VOLUME_DISPATCH_H__
#include <PiDxe.h>
#define EFI_FIRMWARE_VOLUME_DISPATCH_PROTOCOL_GUID \ #define EFI_FIRMWARE_VOLUME_DISPATCH_PROTOCOL_GUID \
{ 0x7aa35a69, 0x506c, 0x444f, {0xa7, 0xaf, 0x69, 0x4b, 0xf5, 0x6f, 0x71, 0xc8 } } { 0x7aa35a69, 0x506c, 0x444f, {0xa7, 0xaf, 0x69, 0x4b, 0xf5, 0x6f, 0x71, 0xc8 } }

View File

@ -22,7 +22,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include <Protocol/OEMBadging.h> #include <Protocol/OEMBadging.h>
#include <Protocol/ConsoleControl.h> #include <Protocol/ConsoleControl.h>
#include <Protocol/GraphicsOutput.h> #include <Protocol/GraphicsOutput.h>
#include <Protocol/FirmwareVolume2.h>
#include <Protocol/UgaDraw.h> #include <Protocol/UgaDraw.h>
#include <Protocol/HiiFont.h> #include <Protocol/HiiFont.h>
#include <Protocol/HiiImage.h> #include <Protocol/HiiImage.h>

View File

@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#define _NULL_MEMORY_TEST_H #define _NULL_MEMORY_TEST_H
#include <Uefi.h> #include <PiDxe.h>
#include <Protocol/GenericMemoryTest.h> #include <Protocol/GenericMemoryTest.h>

View File

@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#define _SETUP_H_ #define _SETUP_H_
#include <Uefi.h> #include <PiDxe.h>
#include <Protocol/Print.h> #include <Protocol/Print.h>
#include <Protocol/Print2.h> #include <Protocol/Print2.h>

View File

@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#ifndef _VARIABLE_H #ifndef _VARIABLE_H
#define _VARIABLE_H #define _VARIABLE_H
#include <Uefi.h> #include <PiDxe.h>
#include <Protocol/VariableWrite.h> #include <Protocol/VariableWrite.h>
#include <Protocol/FaultTolerantWriteLite.h> #include <Protocol/FaultTolerantWriteLite.h>
#include <Protocol/FirmwareVolumeBlock.h> #include <Protocol/FirmwareVolumeBlock.h>

View File

@ -15,8 +15,6 @@
#ifndef __PCD_PPI_H__ #ifndef __PCD_PPI_H__
#define __PCD_PPI_H__ #define __PCD_PPI_H__
#include <PiPei.h>
#define PCD_PPI_GUID \ #define PCD_PPI_GUID \
{ 0x6e81c58, 0x4ad7, 0x44bc, { 0x83, 0x90, 0xf1, 0x2, 0x65, 0xf7, 0x24, 0x80 } } { 0x6e81c58, 0x4ad7, 0x44bc, { 0x83, 0x90, 0xf1, 0x2, 0x65, 0xf7, 0x24, 0x80 } }

View File

@ -21,7 +21,6 @@
#ifndef __PEI_SMBUS2_PPI_H__ #ifndef __PEI_SMBUS2_PPI_H__
#define __PEI_SMBUS2_PPI_H__ #define __PEI_SMBUS2_PPI_H__
#include <PiPei.h>
#include <IndustryStandard/SmBus.h> #include <IndustryStandard/SmBus.h>
#define EFI_PEI_SMBUS2_PPI_GUID \ #define EFI_PEI_SMBUS2_PPI_GUID \

View File

@ -17,8 +17,6 @@
#ifndef __EFI_COMPONENT_NAME_H__ #ifndef __EFI_COMPONENT_NAME_H__
#define __EFI_COMPONENT_NAME_H__ #define __EFI_COMPONENT_NAME_H__
#include <PiDxe.h>
/// ///
/// Global ID for the Component Name Protocol /// Global ID for the Component Name Protocol
/// ///

View File

@ -17,8 +17,6 @@
#ifndef __EFI_COMPONENT_NAME2_H__ #ifndef __EFI_COMPONENT_NAME2_H__
#define __EFI_COMPONENT_NAME2_H__ #define __EFI_COMPONENT_NAME2_H__
#include <PiDxe.h>
/// ///
/// Global ID for the Component Name Protocol /// Global ID for the Component Name Protocol
/// ///

View File

@ -110,6 +110,7 @@ typedef struct {
/// ///
/// Optional variable length _HIDSTR /// Optional variable length _HIDSTR
/// Optional variable length _UIDSTR /// Optional variable length _UIDSTR
/// Optional variable length _CIDSTR
/// ///
} ACPI_EXTENDED_HID_DEVICE_PATH; } ACPI_EXTENDED_HID_DEVICE_PATH;

View File

@ -18,7 +18,6 @@
#ifndef __EFI_DRIVER_BINDING_H__ #ifndef __EFI_DRIVER_BINDING_H__
#define __EFI_DRIVER_BINDING_H__ #define __EFI_DRIVER_BINDING_H__
#include <PiDxe.h>
#include <Protocol/DevicePath.h> #include <Protocol/DevicePath.h>
/// ///
/// Global ID for the ControllerHandle Driver Protocol /// Global ID for the ControllerHandle Driver Protocol

View File

@ -15,7 +15,6 @@
#ifndef __EFI_DRIVER_CONFIGURATION_H__ #ifndef __EFI_DRIVER_CONFIGURATION_H__
#define __EFI_DRIVER_CONFIGURATION_H__ #define __EFI_DRIVER_CONFIGURATION_H__
#include <PiDxe.h>
#include <Protocol/DriverConfiguration2.h> #include <Protocol/DriverConfiguration2.h>
/// ///

View File

@ -15,8 +15,6 @@
#ifndef __EFI_DRIVER_CONFIGURATION2_H__ #ifndef __EFI_DRIVER_CONFIGURATION2_H__
#define __EFI_DRIVER_CONFIGURATION2_H__ #define __EFI_DRIVER_CONFIGURATION2_H__
#include <PiDxe.h>
/// ///
/// Global ID for the Driver Configuration Protocol defined in UEFI 2.0 /// Global ID for the Driver Configuration Protocol defined in UEFI 2.0
/// ///

View File

@ -15,8 +15,6 @@
#ifndef __EFI_DRIVER_DIAGNOSTICS_H__ #ifndef __EFI_DRIVER_DIAGNOSTICS_H__
#define __EFI_DRIVER_DIAGNOSTICS_H__ #define __EFI_DRIVER_DIAGNOSTICS_H__
#include <PiDxe.h>
/// ///
/// Global ID for the Driver Diagnostics Protocol as defined in UEFI 2.0. /// Global ID for the Driver Diagnostics Protocol as defined in UEFI 2.0.
/// ///

View File

@ -18,8 +18,6 @@
#ifndef __EDID_OVERRIDE_H__ #ifndef __EDID_OVERRIDE_H__
#define __EDID_OVERRIDE_H__ #define __EDID_OVERRIDE_H__
#include <PiDxe.h>
#define EFI_EDID_OVERRIDE_PROTOCOL_GUID \ #define EFI_EDID_OVERRIDE_PROTOCOL_GUID \
{ \ { \
0x48ecb431, 0xfb72, 0x45c0, {0xa9, 0x22, 0xf4, 0x58, 0xfe, 0x4, 0xb, 0xd5 } \ 0x48ecb431, 0xfb72, 0x45c0, {0xa9, 0x22, 0xf4, 0x58, 0xfe, 0x4, 0xb, 0xd5 } \

View File

@ -17,8 +17,6 @@
#ifndef __GRAPHICS_OUTPUT_H__ #ifndef __GRAPHICS_OUTPUT_H__
#define __GRAPHICS_OUTPUT_H__ #define __GRAPHICS_OUTPUT_H__
#include <PiDxe.h>
#define EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID \ #define EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID \
{ \ { \
0x9042a9de, 0x23dc, 0x4a38, {0x96, 0xfb, 0x7a, 0xde, 0xd0, 0x80, 0x51, 0x6a } \ 0x9042a9de, 0x23dc, 0x4a38, {0x96, 0xfb, 0x7a, 0xde, 0xd0, 0x80, 0x51, 0x6a } \

View File

@ -15,8 +15,6 @@
#ifndef __PCD_H__ #ifndef __PCD_H__
#define __PCD_H__ #define __PCD_H__
#include <PiDxe.h>
extern EFI_GUID gPcdProtocolGuid; extern EFI_GUID gPcdProtocolGuid;
#define PCD_PROTOCOL_GUID \ #define PCD_PROTOCOL_GUID \

View File

@ -19,8 +19,6 @@
#ifndef __PCI_ROOT_BRIDGE_IO_H__ #ifndef __PCI_ROOT_BRIDGE_IO_H__
#define __PCI_ROOT_BRIDGE_IO_H__ #define __PCI_ROOT_BRIDGE_IO_H__
#include <PiDxe.h>
#define EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_GUID \ #define EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_GUID \
{ \ { \
0x2f707ebb, 0x4a1a, 0x11d4, {0x9a, 0x38, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \ 0x2f707ebb, 0x4a1a, 0x11d4, {0x9a, 0x38, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \

View File

@ -28,8 +28,6 @@
#ifndef __ARCH_PROTOCOL_SECURITY_H__ #ifndef __ARCH_PROTOCOL_SECURITY_H__
#define __ARCH_PROTOCOL_SECURITY_H__ #define __ARCH_PROTOCOL_SECURITY_H__
#include <PiDxe.h>
/// ///
/// Global ID for the Security Code Architectural Protocol /// Global ID for the Security Code Architectural Protocol
/// ///

View File

@ -20,8 +20,6 @@
#ifndef __SIMPLE_TEXT_OUT_H__ #ifndef __SIMPLE_TEXT_OUT_H__
#define __SIMPLE_TEXT_OUT_H__ #define __SIMPLE_TEXT_OUT_H__
#include <PiDxe.h>
#define EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL_GUID \ #define EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL_GUID \
{ \ { \
0x387477c2, 0x69c7, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \ 0x387477c2, 0x69c7, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \

View File

@ -24,7 +24,6 @@
#define __STATUS_CODE_RUNTIME_PROTOCOL_H__ #define __STATUS_CODE_RUNTIME_PROTOCOL_H__
#include <Pi/PiMultiPhase.h> #include <Pi/PiMultiPhase.h>
#include <Uefi/UefiBaseType.h>
#define EFI_STATUS_CODE_RUNTIME_PROTOCOL_GUID \ #define EFI_STATUS_CODE_RUNTIME_PROTOCOL_GUID \
{ 0xd2b2b828, 0x826, 0x48a7, { 0xb3, 0xdf, 0x98, 0x3c, 0x0, 0x60, 0x24, 0xf0 } } { 0xd2b2b828, 0x826, 0x48a7, { 0xb3, 0xdf, 0x98, 0x3c, 0x0, 0x60, 0x24, 0xf0 } }

View File

@ -26,8 +26,6 @@ typedef struct _EFI_TCG_PROTOCOL EFI_TCG_PROTOCOL;
// //
// Set structure alignment to 1-byte // Set structure alignment to 1-byte
// //
#pragma pack (1)
typedef struct { typedef struct {
UINT8 Major; UINT8 Major;
UINT8 Minor; UINT8 Minor;
@ -47,11 +45,6 @@ typedef struct _TCG_EFI_BOOT_SERVICE_CAPABILITY {
typedef UINT32 TCG_ALGORITHM_ID; typedef UINT32 TCG_ALGORITHM_ID;
//
// Restore original structure alignment
//
#pragma pack ()
/** /**
This service provides EFI protocol capability information, state information This service provides EFI protocol capability information, state information
about the TPM, and Event Log state information. about the TPM, and Event Log state information.

View File

@ -21,7 +21,7 @@
#include <Protocol/DriverConfiguration.h> #include <Protocol/DriverConfiguration.h>
#include <Protocol/DriverDiagnostics.h> #include <Protocol/DriverDiagnostics.h>
#include <Protocol/DriverDiagnostics2.h> #include <Protocol/DriverDiagnostics2.h>
#include <Protocol/FirmwareVolume2.h> //#include <Protocol/FirmwareVolume2.h>
#include <Protocol/LoadedImage.h> #include <Protocol/LoadedImage.h>
#include <Guid/EventGroup.h> #include <Guid/EventGroup.h>