1. Move some header files from FrameworkBase.h to FrameworkDxe.h,FrameworkPei.h and...

2. Add common\FrameworkStatusCodeTypeId.h in FrameworkDxe.h and FrameworkPei.h

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

diff --git a/IntelFrameworkPkg/Include/FrameworkBase.h b/IntelFrameworkPkg/Include/FrameworkBase.h
index fb998903496e7c9e4be19252ccd7c1536ee023f8..cf3fb25c560bbfa5f8571f7fb2284f9c8d2b13ff 100644 (file)
--- a/IntelFrameworkPkg/Include/FrameworkBase.h
+++ b/IntelFrameworkPkg/Include/FrameworkBase.h
@@ -21,9 +21,4 @@
 #ifndef _FRAMEWORK_BASE_H_\r
 #define _FRAMEWORK_BASE_H_\r
 \r
-#include <Common/FrameworkFirmwareFileSystem.h>\r
-#include <Common/FrameworkHob.h>\r
-#include <Common/FrameworkLegacy16.h>\r
-#include <Common/DataHubRecords.h>\r
-\r
 #endif\r

diff --git a/IntelFrameworkPkg/Include/FrameworkDxe.h b/IntelFrameworkPkg/Include/FrameworkDxe.h
index 6fb767eb0cb5c8cf3f00dfc4d88c19195825d174..9a1206fdecc8429e0f12bfb5b52d511797cbd7da 100644 (file)
--- a/IntelFrameworkPkg/Include/FrameworkDxe.h
+++ b/IntelFrameworkPkg/Include/FrameworkDxe.h
@@ -21,7 +21,15 @@
 #define _FRAMEWORK_DXE_H_\r
 \r
 #include <FrameworkBase.h>\r
+\r
 #include <Common/FrameworkDxeCis.h>\r
+\r
+#include <Common/FrameworkFirmwareFileSystem.h>\r
+#include <Common/FrameworkHob.h>\r
+#include <Common/FrameworkLegacy16.h>\r
+#include <Common/DataHubRecords.h>\r
+\r
 #include <Common/FrameworkStatusCode.h>\r
+#include <Common/FrameworkStatusCodeDataTypeId.h>\r
 \r
 #endif\r

diff --git a/IntelFrameworkPkg/Include/FrameworkPei.h b/IntelFrameworkPkg/Include/FrameworkPei.h
index fdcbbcf42b1a41f7f6189c36cd46ab0dc9b00a57..8f36e9ee5e61027e6f3d1a08f4a9f8f79ffefdcd 100644 (file)
--- a/IntelFrameworkPkg/Include/FrameworkPei.h
+++ b/IntelFrameworkPkg/Include/FrameworkPei.h
@@ -22,6 +22,13 @@
 \r
 #include <FrameworkBase.h>\r
 #include <PiPei.h>\r
+\r
+#include <Common/FrameworkFirmwareFileSystem.h>\r
+#include <Common/FrameworkHob.h>\r
+#include <Common/FrameworkLegacy16.h>\r
+#include <Common/DataHubRecords.h>\r
+\r
 #include <Common/FrameworkStatusCode.h>\r
+#include <Common/FrameworkStatusCodeDataTypeId.h>\r
 \r
 #endif\r

diff --git a/IntelFrameworkPkg/Include/FrameworkSmm.h b/IntelFrameworkPkg/Include/FrameworkSmm.h
index 0226b9a15bbef5c8e0e051a8ca9eef7cb16cdfc1..0f530b091db1ecd275a5ec890188d9cf0f64a3d6 100644 (file)
--- a/IntelFrameworkPkg/Include/FrameworkSmm.h
+++ b/IntelFrameworkPkg/Include/FrameworkSmm.h
@@ -20,6 +20,8 @@
 #ifndef _FRAMEWORK_SMM_H_\r
 #define _FRAMEWORK_SMM_H_\r
 \r
+#include <FrameworkBase.h>\r
+\r
 #include <FrameworkDxe.h>\r
 #include <Common/FrameworkSmmCis.h>\r
 \r