Clean the public header files to remove the unnecessary include files.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8871 6f19259b-4bc3-4df7-8a09-765794883524
2009-07-10 09:30:53 +00:00
parent 2d63030254
commit 0e0eeecad4
58 changed files with 18 additions and 92 deletions
--- a/IntelFrameworkPkg/Include/Protocol/AcpiS3Save.h
+++ b/IntelFrameworkPkg/Include/Protocol/AcpiS3Save.h
@@ -20,8 +20,6 @@
 #ifndef _ACPI_S3_SAVE_PROTOCOL_H_
 #define _ACPI_S3_SAVE_PROTOCOL_H_

-#include <PiDxe.h>
-
 //
 // Forward reference for pure ANSI compatability
 //
--- a/IntelFrameworkPkg/Include/Protocol/AcpiSupport.h
+++ b/IntelFrameworkPkg/Include/Protocol/AcpiSupport.h
@@ -26,8 +26,6 @@
 #ifndef _ACPI_SUPPORT_PROTOCOL_H_
 #define _ACPI_SUPPORT_PROTOCOL_H_

-#include <PiDxe.h>
-
 typedef struct _EFI_ACPI_SUPPORT_PROTOCOL EFI_ACPI_SUPPORT_PROTOCOL;

 //
--- a/IntelFrameworkPkg/Include/Protocol/BootScriptSave.h
+++ b/IntelFrameworkPkg/Include/Protocol/BootScriptSave.h
@@ -19,7 +19,6 @@
 #ifndef _BOOT_SCRIPT_SAVE_PROTOCOL_H_
 #define _BOOT_SCRIPT_SAVE_PROTOCOL_H_

-#include <PiDxe.h>
 //
 // To get the multiple phase definitions defined in Boot Script Specification
 //
--- a/IntelFrameworkPkg/Include/Protocol/CpuIo.h
+++ b/IntelFrameworkPkg/Include/Protocol/CpuIo.h
@@ -20,7 +20,6 @@
 #ifndef _CPUIO_H_
 #define _CPUIO_H_

-#include <PiDxe.h>

 #define EFI_CPU_IO_PROTOCOL_GUID \
  { \
--- a/IntelFrameworkPkg/Include/Protocol/DataHub.h
+++ b/IntelFrameworkPkg/Include/Protocol/DataHub.h
@@ -20,7 +20,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef __DATA_HUB_H__
 #define __DATA_HUB_H__

-#include <PiDxe.h>

 #define EFI_DATA_HUB_PROTOCOL_GUID \
  { \
--- a/IntelFrameworkPkg/Include/Protocol/FirmwareVolume.h
+++ b/IntelFrameworkPkg/Include/Protocol/FirmwareVolume.h
@@ -25,7 +25,6 @@
 #ifndef _FIRMWARE_VOLUME_H_
 #define _FIRMWARE_VOLUME_H_

-#include <PiDxe.h>

 //
 // Firmware Volume Protocol GUID definition
--- a/IntelFrameworkPkg/Include/Protocol/FrameworkFirmwareVolumeBlock.h
+++ b/IntelFrameworkPkg/Include/Protocol/FrameworkFirmwareVolumeBlock.h
@@ -18,7 +18,6 @@
 #ifndef __FRAMEWORK_FIRMWARE_VOLUME_BLOCK_H__
 #define __FRAMEWORK_FIRMWARE_VOLUME_BLOCK_H__

-#include <PiDxe.h>

 typedef struct _FRAMEWORK_EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL FRAMEWORK_EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL;
 ///
--- a/IntelFrameworkPkg/Include/Protocol/FrameworkFormCallback.h
+++ b/IntelFrameworkPkg/Include/Protocol/FrameworkFormCallback.h
@@ -22,8 +22,6 @@
 #ifndef __FORM_CALLBACK_H__
 #define __FORM_CALLBACK_H__

-#include <FrameworkDxe.h>
-
 #include <Protocol/FrameworkHii.h>
 #include <Protocol/FrameworkFormBrowser.h>

--- a/IntelFrameworkPkg/Include/Protocol/FrameworkHii.h
+++ b/IntelFrameworkPkg/Include/Protocol/FrameworkHii.h
@@ -19,8 +19,7 @@
 #ifndef _FRAMEWORK_HII_H_
 #define _FRAMEWORK_HII_H_

-#include <PiDxe.h>
-
+#include <FrameworkDxe.h>
 //
 // To get EFI_GRAPHICS_OUTPUT_BLT_PIXEL,
 // is defined in MdePkg/Protocol/GraphicsOutput.h
@@ -48,7 +47,6 @@
    0x5542cce1, 0xdf5c, 0x4d1b, { 0xab, 0xca, 0x36, 0x4f, 0x77, 0xd3, 0x99, 0xfb } \
  }

-typedef UINT16                    STRING_REF;
 typedef UINT32                    RELOFST;

 typedef struct _EFI_HII_PROTOCOL  EFI_HII_PROTOCOL;
--- a/IntelFrameworkPkg/Include/Protocol/IdeControllerInit.h
+++ b/IntelFrameworkPkg/Include/Protocol/IdeControllerInit.h
@@ -29,7 +29,6 @@
 #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
--- a/IntelFrameworkPkg/Include/Protocol/IncompatiblePciDeviceSupport.h
+++ b/IntelFrameworkPkg/Include/Protocol/IncompatiblePciDeviceSupport.h
@@ -33,7 +33,6 @@
 #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} }
--- a/IntelFrameworkPkg/Include/Protocol/Legacy8259.h
+++ b/IntelFrameworkPkg/Include/Protocol/Legacy8259.h
@@ -22,7 +22,6 @@
 #ifndef _EFI_LEGACY_8259_H_
 #define _EFI_LEGACY_8259_H_

-#include <PiDxe.h>

 #define EFI_LEGACY_8259_PROTOCOL_GUID \
  { \
--- a/IntelFrameworkPkg/Include/Protocol/LegacyBios.h
+++ b/IntelFrameworkPkg/Include/Protocol/LegacyBios.h
@@ -32,7 +32,7 @@
 #ifndef _EFI_LEGACY_BIOS_H_
 #define _EFI_LEGACY_BIOS_H_

-#include <FrameworkDxe.h>
+#include <Framework/Legacy16.h>

 #define EFI_LEGACY_BIOS_PROTOCOL_GUID \
  { \
--- a/IntelFrameworkPkg/Include/Protocol/LegacyBiosPlatform.h
+++ b/IntelFrameworkPkg/Include/Protocol/LegacyBiosPlatform.h
@@ -24,7 +24,7 @@
 #ifndef _EFI_LEGACY_BIOS_PLATFORM_H_
 #define _EFI_LEGACY_BIOS_PLATFORM_H_

-#include <FrameworkDxe.h>
+#include <Framework/Legacy16.h>

 #define EFI_LEGACY_BIOS_PLATFORM_PROTOCOL_GUID \
  { \
--- a/IntelFrameworkPkg/Include/Protocol/LegacyInterrupt.h
+++ b/IntelFrameworkPkg/Include/Protocol/LegacyInterrupt.h
@@ -19,7 +19,6 @@
 #ifndef _EFI_LEGACY_INTERRUPT_H_
 #define _EFI_LEGACY_INTERRUPT_H_

-#include <PiDxe.h>

 #define EFI_LEGACY_INTERRUPT_PROTOCOL_GUID \
  { \
--- a/IntelFrameworkPkg/Include/Protocol/LegacyRegion.h
+++ b/IntelFrameworkPkg/Include/Protocol/LegacyRegion.h
@@ -21,7 +21,6 @@
 #ifndef _EFI_LEGACY_REGION_H_
 #define _EFI_LEGACY_REGION_H_

-#include <PiDxe.h>

 #define EFI_LEGACY_REGION_PROTOCOL_GUID \
  { \
--- a/IntelFrameworkPkg/Include/Protocol/PciHostBridgeResourceAllocation.h
+++ b/IntelFrameworkPkg/Include/Protocol/PciHostBridgeResourceAllocation.h
@@ -21,7 +21,6 @@
 #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 \
--- a/IntelFrameworkPkg/Include/Protocol/PciHotPlugInit.h
+++ b/IntelFrameworkPkg/Include/Protocol/PciHotPlugInit.h
@@ -21,7 +21,6 @@
 #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
--- a/IntelFrameworkPkg/Include/Protocol/PciPlatform.h
+++ b/IntelFrameworkPkg/Include/Protocol/PciPlatform.h
@@ -22,7 +22,6 @@
 #ifndef _PCI_PLATFORM_H_
 #define _PCI_PLATFORM_H_

-#include <PiDxe.h>
 #include <Protocol/PciHostBridgeResourceAllocation.h>

 //
--- a/IntelFrameworkPkg/Include/Protocol/SectionExtraction.h
+++ b/IntelFrameworkPkg/Include/Protocol/SectionExtraction.h
@@ -25,9 +25,6 @@
 #ifndef _SECTION_EXTRACTION_PROTOCOL_H_
 #define _SECTION_EXTRACTION_PROTOCOL_H_

-#include <PiDxe.h>
-#include <Framework/FirmwareVolumeImageFormat.h>
-
 //
 // Protocol GUID definition
 //
--- a/IntelFrameworkPkg/Include/Protocol/SmmAccess.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmAccess.h
@@ -23,7 +23,6 @@
 #ifndef _SMM_ACCESS_H_
 #define _SMM_ACCESS_H_

-#include <PiDxe.h>
 #include <Guid/SmramMemoryReserve.h>

 typedef struct _EFI_SMM_ACCESS_PROTOCOL  EFI_SMM_ACCESS_PROTOCOL;
--- a/IntelFrameworkPkg/Include/Protocol/SmmControl.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmControl.h
@@ -29,7 +29,6 @@
 #ifndef _SMM_CONTROL_H_
 #define _SMM_CONTROL_H_

-#include <PiDxe.h>

 typedef struct _EFI_SMM_CONTROL_PROTOCOL              EFI_SMM_CONTROL_PROTOCOL;

--- a/IntelFrameworkPkg/Include/Protocol/SmmGpiDispatch.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmGpiDispatch.h
@@ -20,7 +20,6 @@
 #ifndef _SMM_GPI_DISPATCH_H_
 #define _SMM_GPI_DISPATCH_H_

-#include <PiDxe.h>

 //
 // Global ID for the GPI SMI Protocol
--- a/IntelFrameworkPkg/Include/Protocol/SmmIchnDispatch.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmIchnDispatch.h
@@ -23,7 +23,6 @@
 #ifndef _EFI_SMM_ICHN_DISPATCH_H_
 #define _EFI_SMM_ICHN_DISPATCH_H_

-#include <PiDxe.h>

 //
 // Global ID for the ICH SMI Protocol
--- a/IntelFrameworkPkg/Include/Protocol/SmmPeriodicTimerDispatch.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmPeriodicTimerDispatch.h
@@ -21,7 +21,6 @@
 #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
--- a/IntelFrameworkPkg/Include/Protocol/SmmPowerButtonDispatch.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmPowerButtonDispatch.h
@@ -19,7 +19,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #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
--- a/IntelFrameworkPkg/Include/Protocol/SmmStandbyButtonDispatch.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmStandbyButtonDispatch.h
@@ -23,8 +23,6 @@
 #ifndef _EFI_SMM_STANDBY_BUTTON_DISPATCH_H_
 #define _EFI_SMM_STANDBY_BUTTON_DISPATCH_H_

-#include <FrameworkSmm.h>
-
 //
 // Global ID for the Standby Button SMI Protocol
 //
--- a/IntelFrameworkPkg/Include/Protocol/SmmStatusCode.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmStatusCode.h
@@ -23,9 +23,6 @@
 #ifndef _EFI_SMM_ICHN_DISPATCH_H_
 #define _EFI_SMM_ICHN_DISPATCH_H_

-#include <PiDxe.h>
-#include <Pi/PiStatusCode.h>
-
 //
 // Global ID for the Smm Status code Protocol
 //
--- a/IntelFrameworkPkg/Include/Protocol/SmmSwDispatch.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmSwDispatch.h
@@ -21,7 +21,6 @@
 #ifndef _EFI_SMM_SW_DISPATCH_H_
 #define _EFI_SMM_SW_DISPATCH_H_

-#include <PiDxe.h>

 //
 // Global ID for the SW SMI Protocol
--- a/IntelFrameworkPkg/Include/Protocol/SmmSxDispatch.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmSxDispatch.h
@@ -21,7 +21,6 @@
 #ifndef _EFI_SMM_SX_DISPATCH_H_
 #define _EFI_SMM_SX_DISPATCH_H_

-#include <PiDxe.h>

 //
 // Global ID for the Sx SMI Protocol
--- a/IntelFrameworkPkg/Include/Protocol/SmmUsbDispatch.h
+++ b/IntelFrameworkPkg/Include/Protocol/SmmUsbDispatch.h
@@ -19,7 +19,6 @@
 #ifndef _EFI_SMM_USB_DISPATCH_H_
 #define _EFI_SMM_USB_DISPATCH_H_

-#include <PiDxe.h>

 //
 // Global ID for the USB Protocol