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

11 files changed, 9 insertions, 17 deletions

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.h b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.h
index c7f2105f62..68569991bc 100644
--- 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_

 

 

-#include <PiDxe.h>

-#include <FrameworkPei.h>

+#include <FrameworkDxe.h>

 

 #include <Protocol/IsaIo.h>

 #include <Protocol/SerialIo.h>

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h
index 55b56a1045..1027f0ca10 100644
--- 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_

 #define _PS2KEYBOARD_H_

 

-#include <PiDxe.h>

-#include <Framework/StatusCode.h>

+#include <FrameworkDxe.h>

 

 #include <Protocol/SimpleTextIn.h>

 #include <Protocol/SimpleTextInEx.h>

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.h b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointer.h
index e6ba2bc68c..1713041e8f 100644
--- 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__

 #define __PS2MOUSEABSOLUTEPOINTER_H__

 

-#include <PiDxe.h>

-#include <Framework/StatusCode.h>

+#include <FrameworkDxe.h>

 

 #include <Protocol/AbsolutePointer.h>

 #include <Protocol/IsaIo.h>

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.h b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2Mouse.h
index e1595b887b..bb9db00227 100644
--- 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_

 #define _PS2MOUSE_H_

 

-#include <PiDxe.h>

-#include <Framework/StatusCode.h>

+#include <FrameworkDxe.h>

 

 #include <Protocol/SimplePointer.h>

 #include <Protocol/IsaIo.h>

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h b/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h
index 14a68d8f24..c2cdcb1ab8 100644
--- 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_

 #define _INTERNAL_BDS_LIB_H_

 

-#include <PiDxe.h>

+#include <FrameworkDxe.h>

 

 #include <IndustryStandard/Pci22.h>

 #include <IndustryStandard/PeImage.h>

diff --git a/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c b/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
index 4855c925c1..29639e9424 100644
--- a/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
+++ b/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
@@ -12,9 +12,8 @@
 

 **/

 

-

-

 #include <FrameworkPei.h>

+

 #include <Guid/StatusCodeDataTypeId.h>

 #include <Guid/StatusCodeDataTypeDebug.h>

 

diff --git a/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c b/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
index 24606289c0..41b7b8dc26 100644
--- a/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
+++ b/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
@@ -12,7 +12,6 @@
 

 **/

 

-

 #include <FrameworkPei.h>

 

 #include <Guid/StatusCodeDataTypeId.h>

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h b/IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h
index bd4ed53729..31d6df5705 100644
--- 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_

 #define _BDS_MODULE_H_

 

-#include <PiDxe.h>

+#include <FrameworkDxe.h>

 #include <IndustryStandard/PeImage.h>

 #include <Guid/MdeModuleHii.h>

 #include <Guid/FileSystemVolumeLabelInfo.h>

diff --git a/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.h b/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.h
index 7a7f17d990..4ff1d46166 100644
--- 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__

 #define _VGA_CLASS_H__

 

-#include <PiDxe.h>

 #include <FrameworkDxe.h>

 

 #include <Protocol/SimpleTextOut.h>

diff --git a/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.h b/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.h
index 6b0885df51..af4c638547 100644
--- 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_

 

 

-#include <PiDxe.h>

+#include <FrameworkDxe.h>

 

 #include <Protocol/DataHub.h>

 

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.h b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.h
index 50291261e8..d9e9c3db4c 100644
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.h
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.h
@@ -15,9 +15,8 @@
 #ifndef __PEI_STATUS_CODE_H__

 #define __PEI_STATUS_CODE_H__

 

-

-

 #include <FrameworkPei.h>

+

 #include <Guid/MemoryStatusCodeRecord.h>

 #include <Guid/StatusCodeDataTypeId.h>

 #include <Guid/StatusCodeDataTypeDebug.h>