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

23 files changed, 5 insertions, 40 deletions

diff --git a/MdeModulePkg/Include/Protocol/FirmwareVolumeDispatch.h b/MdeModulePkg/Include/Protocol/FirmwareVolumeDispatch.h
index 4f0952b322..27fd1b14dc 100644
--- a/MdeModulePkg/Include/Protocol/FirmwareVolumeDispatch.h
+++ b/MdeModulePkg/Include/Protocol/FirmwareVolumeDispatch.h
@@ -17,8 +17,6 @@
 #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/MdeModulePkg/Library/GraphicsLib/Graphics.c b/MdeModulePkg/Library/GraphicsLib/Graphics.c
index 00e86e6a0d..80149b70af 100644
--- a/MdeModulePkg/Library/GraphicsLib/Graphics.c
+++ b/MdeModulePkg/Library/GraphicsLib/Graphics.c
@@ -22,7 +22,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/OEMBadging.h>

 #include <Protocol/ConsoleControl.h>

 #include <Protocol/GraphicsOutput.h>

-#include <Protocol/FirmwareVolume2.h>

 #include <Protocol/UgaDraw.h>

 #include <Protocol/HiiFont.h>

 #include <Protocol/HiiImage.h>

diff --git a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.h b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.h
index 15dad80b22..3bbc826153 100644
--- a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.h
+++ b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.h
@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _NULL_MEMORY_TEST_H

 

 

-#include <Uefi.h>

+#include <PiDxe.h>

 

 

 #include <Protocol/GenericMemoryTest.h>

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
index 9dcfdb6ee5..6d6d4843db 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
@@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _SETUP_H_

 

 

-#include <Uefi.h>

+#include <PiDxe.h>

 

 #include <Protocol/Print.h>

 #include <Protocol/Print2.h>

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h
index cf241447f1..1fb430e206 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h
@@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _VARIABLE_H

 #define _VARIABLE_H

 

-#include <Uefi.h>

+#include <PiDxe.h>

 #include <Protocol/VariableWrite.h>

 #include <Protocol/FaultTolerantWriteLite.h>

 #include <Protocol/FirmwareVolumeBlock.h>

diff --git a/MdePkg/Include/Ppi/Pcd.h b/MdePkg/Include/Ppi/Pcd.h
index d5cc3b59db..aca531f47d 100644
--- a/MdePkg/Include/Ppi/Pcd.h
+++ b/MdePkg/Include/Ppi/Pcd.h
@@ -15,8 +15,6 @@
 #ifndef __PCD_PPI_H__

 #define __PCD_PPI_H__

 

-#include <PiPei.h>

-

 #define PCD_PPI_GUID \

   { 0x6e81c58, 0x4ad7, 0x44bc, { 0x83, 0x90, 0xf1, 0x2, 0x65, 0xf7, 0x24, 0x80 } }

 

diff --git a/MdePkg/Include/Ppi/Smbus2.h b/MdePkg/Include/Ppi/Smbus2.h
index e27ded9a2b..1cc546782b 100644
--- a/MdePkg/Include/Ppi/Smbus2.h
+++ b/MdePkg/Include/Ppi/Smbus2.h
@@ -21,7 +21,6 @@
 #ifndef __PEI_SMBUS2_PPI_H__

 #define __PEI_SMBUS2_PPI_H__

 

-#include <PiPei.h>

 #include <IndustryStandard/SmBus.h>

 

 #define EFI_PEI_SMBUS2_PPI_GUID \

diff --git a/MdePkg/Include/Protocol/ComponentName.h b/MdePkg/Include/Protocol/ComponentName.h
index 3568c057ad..98e5b76987 100644
--- a/MdePkg/Include/Protocol/ComponentName.h
+++ b/MdePkg/Include/Protocol/ComponentName.h
@@ -17,8 +17,6 @@
 #ifndef __EFI_COMPONENT_NAME_H__

 #define __EFI_COMPONENT_NAME_H__

 

-#include <PiDxe.h>

-

 ///

 /// Global ID for the Component Name Protocol

 ///

diff --git a/MdePkg/Include/Protocol/ComponentName2.h b/MdePkg/Include/Protocol/ComponentName2.h
index a9562474af..fa5c7a8410 100644
--- a/MdePkg/Include/Protocol/ComponentName2.h
+++ b/MdePkg/Include/Protocol/ComponentName2.h
@@ -17,8 +17,6 @@
 #ifndef __EFI_COMPONENT_NAME2_H__

 #define __EFI_COMPONENT_NAME2_H__

 

-#include <PiDxe.h>

-

 ///

 /// Global ID for the Component Name Protocol

 ///

diff --git a/MdePkg/Include/Protocol/DevicePath.h b/MdePkg/Include/Protocol/DevicePath.h
index 48c8f4b77b..1286372f03 100644
--- a/MdePkg/Include/Protocol/DevicePath.h
+++ b/MdePkg/Include/Protocol/DevicePath.h
@@ -110,6 +110,7 @@ typedef struct {
   ///

   /// Optional variable length _HIDSTR

   /// Optional variable length _UIDSTR

+  /// Optional variable length _CIDSTR

   ///

 } ACPI_EXTENDED_HID_DEVICE_PATH;

 

diff --git a/MdePkg/Include/Protocol/DriverBinding.h b/MdePkg/Include/Protocol/DriverBinding.h
index 46e85c89d2..6f6ddf6ad1 100644
--- a/MdePkg/Include/Protocol/DriverBinding.h
+++ b/MdePkg/Include/Protocol/DriverBinding.h
@@ -18,7 +18,6 @@
 #ifndef __EFI_DRIVER_BINDING_H__

 #define __EFI_DRIVER_BINDING_H__

 

-#include <PiDxe.h>

 #include <Protocol/DevicePath.h>

 ///

 /// Global ID for the ControllerHandle Driver Protocol

diff --git a/MdePkg/Include/Protocol/DriverConfiguration.h b/MdePkg/Include/Protocol/DriverConfiguration.h
index ce94de7f8b..7c7eca4531 100644
--- a/MdePkg/Include/Protocol/DriverConfiguration.h
+++ b/MdePkg/Include/Protocol/DriverConfiguration.h
@@ -15,7 +15,6 @@
 #ifndef __EFI_DRIVER_CONFIGURATION_H__

 #define __EFI_DRIVER_CONFIGURATION_H__

 

-#include <PiDxe.h>

 #include <Protocol/DriverConfiguration2.h>

 

 ///

diff --git a/MdePkg/Include/Protocol/DriverConfiguration2.h b/MdePkg/Include/Protocol/DriverConfiguration2.h
index 2d287d66f4..4ae1d0235a 100644
--- a/MdePkg/Include/Protocol/DriverConfiguration2.h
+++ b/MdePkg/Include/Protocol/DriverConfiguration2.h
@@ -15,8 +15,6 @@
 #ifndef __EFI_DRIVER_CONFIGURATION2_H__

 #define __EFI_DRIVER_CONFIGURATION2_H__

 

-#include <PiDxe.h>

-

 ///

 /// Global ID for the Driver Configuration Protocol defined in UEFI 2.0

 ///

diff --git a/MdePkg/Include/Protocol/DriverDiagnostics.h b/MdePkg/Include/Protocol/DriverDiagnostics.h
index d8cddd963f..6c794be50d 100644
--- a/MdePkg/Include/Protocol/DriverDiagnostics.h
+++ b/MdePkg/Include/Protocol/DriverDiagnostics.h
@@ -15,8 +15,6 @@
 #ifndef __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.

 ///

diff --git a/MdePkg/Include/Protocol/EdidOverride.h b/MdePkg/Include/Protocol/EdidOverride.h
index 8a14e97666..1bb51f0908 100644
--- a/MdePkg/Include/Protocol/EdidOverride.h
+++ b/MdePkg/Include/Protocol/EdidOverride.h
@@ -18,8 +18,6 @@
 #ifndef __EDID_OVERRIDE_H__

 #define __EDID_OVERRIDE_H__

 

-#include <PiDxe.h>

-

 #define EFI_EDID_OVERRIDE_PROTOCOL_GUID \

   { \

     0x48ecb431, 0xfb72, 0x45c0, {0xa9, 0x22, 0xf4, 0x58, 0xfe, 0x4, 0xb, 0xd5 } \

diff --git a/MdePkg/Include/Protocol/GraphicsOutput.h b/MdePkg/Include/Protocol/GraphicsOutput.h
index c1340301b5..ca96b4a5cf 100644
--- a/MdePkg/Include/Protocol/GraphicsOutput.h
+++ b/MdePkg/Include/Protocol/GraphicsOutput.h
@@ -17,8 +17,6 @@
 #ifndef __GRAPHICS_OUTPUT_H__

 #define __GRAPHICS_OUTPUT_H__

 

-#include <PiDxe.h>

-

 #define EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID \

   { \

     0x9042a9de, 0x23dc, 0x4a38, {0x96, 0xfb, 0x7a, 0xde, 0xd0, 0x80, 0x51, 0x6a } \

diff --git a/MdePkg/Include/Protocol/Pcd.h b/MdePkg/Include/Protocol/Pcd.h
index 9a6880c449..213ca9c6b0 100644
--- a/MdePkg/Include/Protocol/Pcd.h
+++ b/MdePkg/Include/Protocol/Pcd.h
@@ -15,8 +15,6 @@
 #ifndef __PCD_H__

 #define __PCD_H__

 

-#include <PiDxe.h>

-

 extern EFI_GUID gPcdProtocolGuid;

 

 #define PCD_PROTOCOL_GUID \

diff --git a/MdePkg/Include/Protocol/PciRootBridgeIo.h b/MdePkg/Include/Protocol/PciRootBridgeIo.h
index bf96106a32..fb17222d3a 100644
--- a/MdePkg/Include/Protocol/PciRootBridgeIo.h
+++ b/MdePkg/Include/Protocol/PciRootBridgeIo.h
@@ -19,8 +19,6 @@
 #ifndef __PCI_ROOT_BRIDGE_IO_H__

 #define __PCI_ROOT_BRIDGE_IO_H__

 

-#include <PiDxe.h>

-

 #define EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_GUID \

   { \

     0x2f707ebb, 0x4a1a, 0x11d4, {0x9a, 0x38, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \

diff --git a/MdePkg/Include/Protocol/Security.h b/MdePkg/Include/Protocol/Security.h
index 9028fb3511..0ae4707b15 100644
--- a/MdePkg/Include/Protocol/Security.h
+++ b/MdePkg/Include/Protocol/Security.h
@@ -28,8 +28,6 @@
 #ifndef __ARCH_PROTOCOL_SECURITY_H__

 #define __ARCH_PROTOCOL_SECURITY_H__

 

-#include <PiDxe.h>

-

 ///

 /// Global ID for the Security Code Architectural Protocol

 ///

diff --git a/MdePkg/Include/Protocol/SimpleTextOut.h b/MdePkg/Include/Protocol/SimpleTextOut.h
index 607d0609a8..2ab3fc4645 100644
--- a/MdePkg/Include/Protocol/SimpleTextOut.h
+++ b/MdePkg/Include/Protocol/SimpleTextOut.h
@@ -20,8 +20,6 @@
 #ifndef __SIMPLE_TEXT_OUT_H__

 #define __SIMPLE_TEXT_OUT_H__

 

-#include <PiDxe.h>

-

 #define EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL_GUID \

   { \

     0x387477c2, 0x69c7, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \

diff --git a/MdePkg/Include/Protocol/StatusCode.h b/MdePkg/Include/Protocol/StatusCode.h
index 2bbe744aa8..d9f08c70bc 100644
--- a/MdePkg/Include/Protocol/StatusCode.h
+++ b/MdePkg/Include/Protocol/StatusCode.h
@@ -24,7 +24,6 @@
 #define __STATUS_CODE_RUNTIME_PROTOCOL_H__

 

 #include <Pi/PiMultiPhase.h>

-#include <Uefi/UefiBaseType.h>

 

 #define EFI_STATUS_CODE_RUNTIME_PROTOCOL_GUID  \

 { 0xd2b2b828, 0x826, 0x48a7,  { 0xb3, 0xdf, 0x98, 0x3c, 0x0, 0x60, 0x24, 0xf0 } }

diff --git a/MdePkg/Include/Protocol/TcgService.h b/MdePkg/Include/Protocol/TcgService.h
index 430e4a6a84..7ec3dd7cbb 100644
--- a/MdePkg/Include/Protocol/TcgService.h
+++ b/MdePkg/Include/Protocol/TcgService.h
@@ -26,8 +26,6 @@ typedef struct _EFI_TCG_PROTOCOL EFI_TCG_PROTOCOL;
 //

 // Set structure alignment to 1-byte

 //

-#pragma pack (1)

-

 typedef struct {

   UINT8  Major;

   UINT8  Minor;

@@ -47,11 +45,6 @@ typedef struct _TCG_EFI_BOOT_SERVICE_CAPABILITY {
 

 typedef UINT32   TCG_ALGORITHM_ID;

 

-//

-// Restore original structure alignment

-//

-#pragma pack ()

-

 /**

   This service provides EFI protocol capability information, state information 

   about the TPM, and Event Log state information.

diff --git a/MdePkg/Library/UefiLib/UefiLibInternal.h b/MdePkg/Library/UefiLib/UefiLibInternal.h
index ff575f69fc..a0ac2734b2 100644
--- a/MdePkg/Library/UefiLib/UefiLibInternal.h
+++ b/MdePkg/Library/UefiLib/UefiLibInternal.h
@@ -21,7 +21,7 @@
 #include <Protocol/DriverConfiguration.h>

 #include <Protocol/DriverDiagnostics.h>

 #include <Protocol/DriverDiagnostics2.h>

-#include <Protocol/FirmwareVolume2.h>

+//#include <Protocol/FirmwareVolume2.h>

 #include <Protocol/LoadedImage.h>

 

 #include <Guid/EventGroup.h>