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

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6087 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Include/Protocol/FirmwareVolumeDispatch.h b/MdeModulePkg/Include/Protocol/FirmwareVolumeDispatch.h
index 4f0952b322f9d9aa6b85e4391b3dae60c117e865..27fd1b14dc88f2700b82822feb79384d939431c5 100644 (file)
--- a/MdeModulePkg/Include/Protocol/FirmwareVolumeDispatch.h
+++ b/MdeModulePkg/Include/Protocol/FirmwareVolumeDispatch.h
@@ -17,8 +17,6 @@
 #ifndef __FIRMWARE_VOLUME_DISPATCH_H__\r
 #define __FIRMWARE_VOLUME_DISPATCH_H__\r
 \r
-#include <PiDxe.h>\r
-\r
 #define EFI_FIRMWARE_VOLUME_DISPATCH_PROTOCOL_GUID \\r
   { 0x7aa35a69, 0x506c, 0x444f, {0xa7, 0xaf, 0x69, 0x4b, 0xf5, 0x6f, 0x71, 0xc8 } }\r
 \r

diff --git a/MdeModulePkg/Library/GraphicsLib/Graphics.c b/MdeModulePkg/Library/GraphicsLib/Graphics.c
index 00e86e6a0dc951abefd75bab1e10f6704f513e2e..80149b70aff18a2bc30aab0175390c690cc1f009 100644 (file)
--- 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>\r
 #include <Protocol/ConsoleControl.h>\r
 #include <Protocol/GraphicsOutput.h>\r
-#include <Protocol/FirmwareVolume2.h>\r
 #include <Protocol/UgaDraw.h>\r
 #include <Protocol/HiiFont.h>\r
 #include <Protocol/HiiImage.h>\r

diff --git a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.h b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.h
index 15dad80b22c04cb062050ae9819f03aa551cb99c..3bbc8261539ae0ed83c983a8e95f5fff4b2976f7 100644 (file)
--- 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\r
 \r
 \r
-#include <Uefi.h>\r
+#include <PiDxe.h>\r
 \r
 \r
 #include <Protocol/GenericMemoryTest.h>\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
index 9dcfdb6ee5855bf49ff22df0707939bfce6edcf8..6d6d4843dba0436b0ce2f0a03088a0f5105fab85 100644 (file)
--- 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_\r
 \r
 \r
-#include <Uefi.h>\r
+#include <PiDxe.h>\r
 \r
 #include <Protocol/Print.h>\r
 #include <Protocol/Print2.h>\r

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h
index cf241447f16ca811a4603eae210f59dc6f7c9211..1fb430e2061cf6dde11d666a8b31c0d6084ee55c 100644 (file)
--- 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\r
 #define _VARIABLE_H\r
 \r
-#include <Uefi.h>\r
+#include <PiDxe.h>\r
 #include <Protocol/VariableWrite.h>\r
 #include <Protocol/FaultTolerantWriteLite.h>\r
 #include <Protocol/FirmwareVolumeBlock.h>\r

diff --git a/MdePkg/Include/Ppi/Pcd.h b/MdePkg/Include/Ppi/Pcd.h
index d5cc3b59dbcac3aae07d0dad07c2cd7c4f62f330..aca531f47dc093b83574ea1a1b84f8386b89810a 100644 (file)
--- a/MdePkg/Include/Ppi/Pcd.h
+++ b/MdePkg/Include/Ppi/Pcd.h
@@ -15,8 +15,6 @@
 #ifndef __PCD_PPI_H__\r
 #define __PCD_PPI_H__\r
 \r
-#include <PiPei.h>\r
-\r
 #define PCD_PPI_GUID \\r
   { 0x6e81c58, 0x4ad7, 0x44bc, { 0x83, 0x90, 0xf1, 0x2, 0x65, 0xf7, 0x24, 0x80 } }\r
 \r

diff --git a/MdePkg/Include/Ppi/Smbus2.h b/MdePkg/Include/Ppi/Smbus2.h
index e27ded9a2b359a72b707276b8320ad3836bc34f8..1cc546782b980f6bc0478f2df65a73ffbe53e585 100644 (file)
--- a/MdePkg/Include/Ppi/Smbus2.h
+++ b/MdePkg/Include/Ppi/Smbus2.h
@@ -21,7 +21,6 @@
 #ifndef __PEI_SMBUS2_PPI_H__\r
 #define __PEI_SMBUS2_PPI_H__\r
 \r
-#include <PiPei.h>\r
 #include <IndustryStandard/SmBus.h>\r
 \r
 #define EFI_PEI_SMBUS2_PPI_GUID \\r

diff --git a/MdePkg/Include/Protocol/ComponentName.h b/MdePkg/Include/Protocol/ComponentName.h
index 3568c057addb1af82e0658f3a9c45f21bcec5133..98e5b76987b2f947edcad6f968b76335d7357f24 100644 (file)
--- a/MdePkg/Include/Protocol/ComponentName.h
+++ b/MdePkg/Include/Protocol/ComponentName.h
@@ -17,8 +17,6 @@
 #ifndef __EFI_COMPONENT_NAME_H__\r
 #define __EFI_COMPONENT_NAME_H__\r
 \r
-#include <PiDxe.h>\r
-\r
 ///\r
 /// Global ID for the Component Name Protocol\r
 ///\r

diff --git a/MdePkg/Include/Protocol/ComponentName2.h b/MdePkg/Include/Protocol/ComponentName2.h
index a9562474afecb1711c8d2a2b714200f06b6e47e2..fa5c7a841051aa73b841126bfd56838cb747c78f 100644 (file)
--- a/MdePkg/Include/Protocol/ComponentName2.h
+++ b/MdePkg/Include/Protocol/ComponentName2.h
@@ -17,8 +17,6 @@
 #ifndef __EFI_COMPONENT_NAME2_H__\r
 #define __EFI_COMPONENT_NAME2_H__\r
 \r
-#include <PiDxe.h>\r
-\r
 ///\r
 /// Global ID for the Component Name Protocol\r
 ///\r

diff --git a/MdePkg/Include/Protocol/DevicePath.h b/MdePkg/Include/Protocol/DevicePath.h
index 48c8f4b77bb05c42ca245c393f6b418e2ff015ea..1286372f03a6aea8592081fb8887185806ede742 100644 (file)
--- a/MdePkg/Include/Protocol/DevicePath.h
+++ b/MdePkg/Include/Protocol/DevicePath.h
@@ -110,6 +110,7 @@ typedef struct {
   ///\r
   /// Optional variable length _HIDSTR\r
   /// Optional variable length _UIDSTR\r
+  /// Optional variable length _CIDSTR\r
   ///\r
 } ACPI_EXTENDED_HID_DEVICE_PATH;\r
 \r

diff --git a/MdePkg/Include/Protocol/DriverBinding.h b/MdePkg/Include/Protocol/DriverBinding.h
index 46e85c89d26b9193f3a7d5df91fb4e788f17ad79..6f6ddf6ad19d9ca7a25574b708062d3834cafccd 100644 (file)
--- a/MdePkg/Include/Protocol/DriverBinding.h
+++ b/MdePkg/Include/Protocol/DriverBinding.h
@@ -18,7 +18,6 @@
 #ifndef __EFI_DRIVER_BINDING_H__\r
 #define __EFI_DRIVER_BINDING_H__\r
 \r
-#include <PiDxe.h>\r
 #include <Protocol/DevicePath.h>\r
 ///\r
 /// Global ID for the ControllerHandle Driver Protocol\r

diff --git a/MdePkg/Include/Protocol/DriverConfiguration.h b/MdePkg/Include/Protocol/DriverConfiguration.h
index ce94de7f8b902ff108fdac87d5a403aa72e14522..7c7eca45312b4fffe684486814aaf746979427da 100644 (file)
--- a/MdePkg/Include/Protocol/DriverConfiguration.h
+++ b/MdePkg/Include/Protocol/DriverConfiguration.h
@@ -15,7 +15,6 @@
 #ifndef __EFI_DRIVER_CONFIGURATION_H__\r
 #define __EFI_DRIVER_CONFIGURATION_H__\r
 \r
-#include <PiDxe.h>\r
 #include <Protocol/DriverConfiguration2.h>\r
 \r
 ///\r

diff --git a/MdePkg/Include/Protocol/DriverConfiguration2.h b/MdePkg/Include/Protocol/DriverConfiguration2.h
index 2d287d66f488e67c9360a7e8f5ddfa643a4498b0..4ae1d0235a7bdccd70e247a99de47bde6dac8ae0 100644 (file)
--- a/MdePkg/Include/Protocol/DriverConfiguration2.h
+++ b/MdePkg/Include/Protocol/DriverConfiguration2.h
@@ -15,8 +15,6 @@
 #ifndef __EFI_DRIVER_CONFIGURATION2_H__\r
 #define __EFI_DRIVER_CONFIGURATION2_H__\r
 \r
-#include <PiDxe.h>\r
-\r
 ///\r
 /// Global ID for the Driver Configuration Protocol defined in UEFI 2.0\r
 ///\r

diff --git a/MdePkg/Include/Protocol/DriverDiagnostics.h b/MdePkg/Include/Protocol/DriverDiagnostics.h
index d8cddd963f325c0fa5bd18f37e4ac12ec81a1248..6c794be50d0efd1e5fdbd332a6b3f50a213614f8 100644 (file)
--- a/MdePkg/Include/Protocol/DriverDiagnostics.h
+++ b/MdePkg/Include/Protocol/DriverDiagnostics.h
@@ -15,8 +15,6 @@
 #ifndef __EFI_DRIVER_DIAGNOSTICS_H__\r
 #define __EFI_DRIVER_DIAGNOSTICS_H__\r
 \r
-#include <PiDxe.h>\r
-\r
 ///\r
 /// Global ID for the Driver Diagnostics Protocol as defined in UEFI 2.0.\r
 ///\r

diff --git a/MdePkg/Include/Protocol/EdidOverride.h b/MdePkg/Include/Protocol/EdidOverride.h
index 8a14e9766667b6d2f520ad9e2d24182b7ba9cc76..1bb51f09081e58bd754cc63fa0d0f0e1cbb2c02a 100644 (file)
--- a/MdePkg/Include/Protocol/EdidOverride.h
+++ b/MdePkg/Include/Protocol/EdidOverride.h
@@ -18,8 +18,6 @@
 #ifndef __EDID_OVERRIDE_H__\r
 #define __EDID_OVERRIDE_H__\r
 \r
-#include <PiDxe.h>\r
-\r
 #define EFI_EDID_OVERRIDE_PROTOCOL_GUID \\r
   { \\r
     0x48ecb431, 0xfb72, 0x45c0, {0xa9, 0x22, 0xf4, 0x58, 0xfe, 0x4, 0xb, 0xd5 } \\r

diff --git a/MdePkg/Include/Protocol/GraphicsOutput.h b/MdePkg/Include/Protocol/GraphicsOutput.h
index c1340301b535ea0fff4d92639f91d0906311d046..ca96b4a5cf3cbe9bc9d1420f7529f535bcd28e2e 100644 (file)
--- a/MdePkg/Include/Protocol/GraphicsOutput.h
+++ b/MdePkg/Include/Protocol/GraphicsOutput.h
@@ -17,8 +17,6 @@
 #ifndef __GRAPHICS_OUTPUT_H__\r
 #define __GRAPHICS_OUTPUT_H__\r
 \r
-#include <PiDxe.h>\r
-\r
 #define EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID \\r
   { \\r
     0x9042a9de, 0x23dc, 0x4a38, {0x96, 0xfb, 0x7a, 0xde, 0xd0, 0x80, 0x51, 0x6a } \\r

diff --git a/MdePkg/Include/Protocol/Pcd.h b/MdePkg/Include/Protocol/Pcd.h
index 9a6880c4499211bd67dfca98b00326d7a4600779..213ca9c6b0cf4d4b04ef8d84e5417b222e154aea 100644 (file)
--- a/MdePkg/Include/Protocol/Pcd.h
+++ b/MdePkg/Include/Protocol/Pcd.h
@@ -15,8 +15,6 @@
 #ifndef __PCD_H__\r
 #define __PCD_H__\r
 \r
-#include <PiDxe.h>\r
-\r
 extern EFI_GUID gPcdProtocolGuid;\r
 \r
 #define PCD_PROTOCOL_GUID \\r

diff --git a/MdePkg/Include/Protocol/PciRootBridgeIo.h b/MdePkg/Include/Protocol/PciRootBridgeIo.h
index bf96106a32b76f061cdcbd40292d99436bc4e58b..fb17222d3ad488d44b0493fe07757b0bab33f6cd 100644 (file)
--- a/MdePkg/Include/Protocol/PciRootBridgeIo.h
+++ b/MdePkg/Include/Protocol/PciRootBridgeIo.h
@@ -19,8 +19,6 @@
 #ifndef __PCI_ROOT_BRIDGE_IO_H__\r
 #define __PCI_ROOT_BRIDGE_IO_H__\r
 \r
-#include <PiDxe.h>\r
-\r
 #define EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_GUID \\r
   { \\r
     0x2f707ebb, 0x4a1a, 0x11d4, {0x9a, 0x38, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \\r

diff --git a/MdePkg/Include/Protocol/Security.h b/MdePkg/Include/Protocol/Security.h
index 9028fb3511494efbb04a11d58a2b6bde15c0390f..0ae4707b15d395c82ff564853521a9e1d38c8d5b 100644 (file)
--- a/MdePkg/Include/Protocol/Security.h
+++ b/MdePkg/Include/Protocol/Security.h
@@ -28,8 +28,6 @@
 #ifndef __ARCH_PROTOCOL_SECURITY_H__\r
 #define __ARCH_PROTOCOL_SECURITY_H__\r
 \r
-#include <PiDxe.h>\r
-\r
 ///\r
 /// Global ID for the Security Code Architectural Protocol\r
 ///\r

diff --git a/MdePkg/Include/Protocol/SimpleTextOut.h b/MdePkg/Include/Protocol/SimpleTextOut.h
index 607d0609a8070c85fc8328c0da1055869a2bb1b5..2ab3fc4645ba2b7320a21525e2280d482ca947a5 100644 (file)
--- a/MdePkg/Include/Protocol/SimpleTextOut.h
+++ b/MdePkg/Include/Protocol/SimpleTextOut.h
@@ -20,8 +20,6 @@
 #ifndef __SIMPLE_TEXT_OUT_H__\r
 #define __SIMPLE_TEXT_OUT_H__\r
 \r
-#include <PiDxe.h>\r
-\r
 #define EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL_GUID \\r
   { \\r
     0x387477c2, 0x69c7, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \\r

diff --git a/MdePkg/Include/Protocol/StatusCode.h b/MdePkg/Include/Protocol/StatusCode.h
index 2bbe744aa846245eae308c801c57cbdd14f4029e..d9f08c70bc0ad118165c73af82df1de7c2301fa2 100644 (file)
--- a/MdePkg/Include/Protocol/StatusCode.h
+++ b/MdePkg/Include/Protocol/StatusCode.h
@@ -24,7 +24,6 @@
 #define __STATUS_CODE_RUNTIME_PROTOCOL_H__\r
 \r
 #include <Pi/PiMultiPhase.h>\r
-#include <Uefi/UefiBaseType.h>\r
 \r
 #define EFI_STATUS_CODE_RUNTIME_PROTOCOL_GUID  \\r
 { 0xd2b2b828, 0x826, 0x48a7,  { 0xb3, 0xdf, 0x98, 0x3c, 0x0, 0x60, 0x24, 0xf0 } }\r

diff --git a/MdePkg/Include/Protocol/TcgService.h b/MdePkg/Include/Protocol/TcgService.h
index 430e4a6a84b1cb8eb3064e3019b2ea7e0a131fbd..7ec3dd7cbbe2aee1ec28cd4cf76969330ba6c75f 100644 (file)
--- a/MdePkg/Include/Protocol/TcgService.h
+++ b/MdePkg/Include/Protocol/TcgService.h
@@ -26,8 +26,6 @@ typedef struct _EFI_TCG_PROTOCOL EFI_TCG_PROTOCOL;
 //\r
 // Set structure alignment to 1-byte\r
 //\r
-#pragma pack (1)\r
-\r
 typedef struct {\r
   UINT8  Major;\r
   UINT8  Minor;\r
@@ -47,11 +45,6 @@ typedef struct _TCG_EFI_BOOT_SERVICE_CAPABILITY {
 \r
 typedef UINT32   TCG_ALGORITHM_ID;\r
 \r
-//\r
-// Restore original structure alignment\r
-//\r
-#pragma pack ()\r
-\r
 /**\r
   This service provides EFI protocol capability information, state information \r
   about the TPM, and Event Log state information.\r

diff --git a/MdePkg/Library/UefiLib/UefiLibInternal.h b/MdePkg/Library/UefiLib/UefiLibInternal.h
index ff575f69fca57473425dea1f876a0374bce483ca..a0ac2734b28d52c40923bb357d2e25bced7f6de2 100644 (file)
--- a/MdePkg/Library/UefiLib/UefiLibInternal.h
+++ b/MdePkg/Library/UefiLib/UefiLibInternal.h
@@ -21,7 +21,7 @@
 #include <Protocol/DriverConfiguration.h>\r
 #include <Protocol/DriverDiagnostics.h>\r
 #include <Protocol/DriverDiagnostics2.h>\r
-#include <Protocol/FirmwareVolume2.h>\r
+//#include <Protocol/FirmwareVolume2.h>\r
 #include <Protocol/LoadedImage.h>\r
 \r
 #include <Guid/EventGroup.h>\r