Remove extra #includes where possible to make build more efficient

If module really is a Framework module and not a PI module, then use FrameworkDxe.h instead of PeDxe.h

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

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.h b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.h
index c7f2105f6264095f5f45cd08f2574ab82c99e2aa..68569991bce8846dabbd8eb7ba5e430a6c6d96c0 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.h
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.h
@@ -16,8 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _SERIAL_H_\r
 \r
 \r
-#include <PiDxe.h>\r
-#include <FrameworkPei.h>\r
+#include <FrameworkDxe.h>\r
 \r
 #include <Protocol/IsaIo.h>\r
 #include <Protocol/SerialIo.h>\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h
index 55b56a10451a2f6df826a1bcc457073f12460e31..1027f0ca10b34287284bd4018a50dc6177fddbb3 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h
@@ -15,8 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _PS2KEYBOARD_H_\r
 #define _PS2KEYBOARD_H_\r
 \r
-#include <PiDxe.h>\r
-#include <Framework/StatusCode.h>\r
+#include <FrameworkDxe.h>\r
 \r
 #include <Protocol/SimpleTextIn.h>\r
 #include <Protocol/SimpleTextInEx.h>\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.h b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.h
index e6ba2bc68c33f2f67ccf2d48417661a4cfb450f7..1713041e8f1e8cfc0c0f06243020a48d200eb878 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.h
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.h
@@ -15,8 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef __PS2MOUSEABSOLUTEPOINTER_H__\r
 #define __PS2MOUSEABSOLUTEPOINTER_H__\r
 \r
-#include <PiDxe.h>\r
-#include <Framework/StatusCode.h>\r
+#include <FrameworkDxe.h>\r
 \r
 #include <Protocol/AbsolutePointer.h>\r
 #include <Protocol/IsaIo.h>\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.h b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.h
index e1595b887b501fdff89a61e47a40a1a0f55e9299..bb9db0022788cb3d462f82ce387161f0b3438858 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.h
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.h
@@ -15,8 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _PS2MOUSE_H_\r
 #define _PS2MOUSE_H_\r
 \r
-#include <PiDxe.h>\r
-#include <Framework/StatusCode.h>\r
+#include <FrameworkDxe.h>\r
 \r
 #include <Protocol/SimplePointer.h>\r
 #include <Protocol/IsaIo.h>\r

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h b/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h
index 14a68d8f24fca8d10d5b37d60575ef1367cf5c5c..c2cdcb1ab8c537e25c11ba92cac6cca7bdfe4506 100644 (file)
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h
@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _INTERNAL_BDS_LIB_H_\r
 #define _INTERNAL_BDS_LIB_H_\r
 \r
-#include <PiDxe.h>\r
+#include <FrameworkDxe.h>\r
 \r
 #include <IndustryStandard/Pci22.h>\r
 #include <IndustryStandard/PeImage.h>\r

diff --git a/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c b/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
index 4855c925c1249d6c049c5b07b7984832db392019..29639e9424f6ce1a9ffdba21c71e32e29e76a615 100644 (file)
--- a/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
+++ b/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
@@ -12,9 +12,8 @@
 \r
 **/\r
 \r
-\r
-\r
 #include <FrameworkPei.h>\r
+\r
 #include <Guid/StatusCodeDataTypeId.h>\r
 #include <Guid/StatusCodeDataTypeDebug.h>\r
 \r

diff --git a/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c b/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
index 24606289c02db0df410ce07ecf551a24a88b6adf..41b7b8dc265f5790193baa165099828ca7d4b6e4 100644 (file)
--- a/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
+++ b/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
@@ -12,7 +12,6 @@
 \r
 **/\r
 \r
-\r
 #include <FrameworkPei.h>\r
 \r
 #include <Guid/StatusCodeDataTypeId.h>\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h b/IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h
index bd4ed537291c52ec218f0d19c97b1a7a88e04e0a..31d6df57058c7f164e9008046d0f4479203f271a 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h
@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _BDS_MODULE_H_\r
 #define _BDS_MODULE_H_\r
 \r
-#include <PiDxe.h>\r
+#include <FrameworkDxe.h>\r
 #include <IndustryStandard/PeImage.h>\r
 #include <Guid/MdeModuleHii.h>\r
 #include <Guid/FileSystemVolumeLabelInfo.h>\r

diff --git a/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.h b/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.h
index 7a7f17d9906279de8142e0d9f9248d1eb4c0931b..4ff1d461664ce1227b6499a0ed332c88e66b218f 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.h
+++ b/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.h
@@ -16,7 +16,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _VGA_CLASS_H__\r
 #define _VGA_CLASS_H__\r
 \r
-#include <PiDxe.h>\r
 #include <FrameworkDxe.h>\r
 \r
 #include <Protocol/SimpleTextOut.h>\r

diff --git a/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.h b/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.h
index 6b0885df51764898b8b764d98069756fff6564b3..af4c638547b14d169dd970c43323c6ec9c37e1d3 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.h
+++ b/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.h
@@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _DATA_HUB_H_\r
 \r
 \r
-#include <PiDxe.h>\r
+#include <FrameworkDxe.h>\r
 \r
 #include <Protocol/DataHub.h>\r
 \r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.h b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.h
index 50291261e8ea00d24a56984a8f47825ac5a02a47..d9e9c3db4c2dd8b021a0a07002c354f81700ea3d 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.h
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.h
@@ -15,9 +15,8 @@
 #ifndef __PEI_STATUS_CODE_H__\r
 #define __PEI_STATUS_CODE_H__\r
 \r
-\r
-\r
 #include <FrameworkPei.h>\r
+\r
 #include <Guid/MemoryStatusCodeRecord.h>\r
 #include <Guid/StatusCodeDataTypeId.h>\r
 #include <Guid/StatusCodeDataTypeDebug.h>\r