Retire <FrameworkModuleBase.h>, <FrameworkModuleDxe.h>, and <FrameworkModulePei.h>

They only provided a single #define that is associated with DEBUG() messages sent through ReportStatusCode.  That one #define has now been added to <Guid/StatusCodeDataTypeDebug.h>

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

diff --git a/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c b/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c
index 97d42237b7f9669ab93a45a325b8820340b4f98a..d0d9147f02d644dcf07b3d5033ab0a0c15c80f6e 100644 (file)
--- a/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c
+++ b/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c
@@ -18,7 +18,6 @@
 // The package level header files this module uses\r
 //\r
 #include <FrameworkDxe.h>\r
-#include <FrameworkModuleDxe.h>\r
 #include <WinNtDxe.h>\r
 \r
 //\r
@@ -26,6 +25,7 @@
 //\r
 #include <Protocol/WinNtThunk.h>\r
 #include <Guid/StatusCodeDataTypeId.h>\r
+#include <Guid/StatusCodeDataTypeDebug.h>\r
 //\r
 // The Library classes this module consumes\r
 //\r

diff --git a/Nt32Pkg/Library/DxeNt32PeCoffExtraActionLib/DxeNt32PeCoffExtraActionLib.c b/Nt32Pkg/Library/DxeNt32PeCoffExtraActionLib/DxeNt32PeCoffExtraActionLib.c
index ef46107742a69f550f22c53fe4071142b74cfd57..23c19017dffcb75f90822d340e024860ba9146c1 100644 (file)
--- a/Nt32Pkg/Library/DxeNt32PeCoffExtraActionLib/DxeNt32PeCoffExtraActionLib.c
+++ b/Nt32Pkg/Library/DxeNt32PeCoffExtraActionLib/DxeNt32PeCoffExtraActionLib.c
@@ -25,7 +25,6 @@ Abstract:
 // The package level header files this module uses\r
 //\r
 #include <FrameworkDxe.h>\r
-#include <FrameworkModuleDxe.h>\r
 #include <WinNtDxe.h>\r
 \r
 //\r

diff --git a/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c b/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c
index 56d402c84cfa12c7a835a4e10ebc18783649c672..bc8db3879630f2fbb54b9b9daa0ffd8b3ac42eef 100644 (file)
--- a/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c
+++ b/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c
@@ -17,14 +17,14 @@
 //\r
 // The package level header files this module uses\r
 //\r
-#include <FrameworkPei.h>\r
-#include <FrameworkModulePei.h>\r
+#include <PiPei.h>\r
 #include <WinNtPeim.h>\r
 \r
 //\r
 // The protocols, PPI and GUID defintions for this module\r
 //\r
 #include <Guid/StatusCodeDataTypeId.h>\r
+#include <Guid/StatusCodeDataTypeDebug.h>\r
 #include <Ppi/NtThunk.h>\r
 //\r
 // The Library classes this module consumes\r

diff --git a/Nt32Pkg/Library/PeiNt32PeCoffExtraActionLib/PeiNt32PeCoffExtraActionLib.c b/Nt32Pkg/Library/PeiNt32PeCoffExtraActionLib/PeiNt32PeCoffExtraActionLib.c
index d3ac3ae183bf27022ba2c0c983ffe1b4ac4f12e9..828b494ab91ab52a05976302e15a592413de7996 100644 (file)
--- a/Nt32Pkg/Library/PeiNt32PeCoffExtraActionLib/PeiNt32PeCoffExtraActionLib.c
+++ b/Nt32Pkg/Library/PeiNt32PeCoffExtraActionLib/PeiNt32PeCoffExtraActionLib.c
@@ -24,8 +24,7 @@ Abstract:
 //\r
 // The package level header files this module uses\r
 //\r
-#include <FrameworkPei.h>\r
-#include <FrameworkModulePei.h>\r
+#include <PiPei.h>\r
 #include <WinNtPeim.h>\r
 \r
 //\r

diff --git a/Nt32Pkg/Sec/SecMain.c b/Nt32Pkg/Sec/SecMain.c
index f1cf33910cbac69327da7d0107967bea050ffeb6..21cca57d5dfdb344229709608a7c28e190b77300 100644 (file)
--- a/Nt32Pkg/Sec/SecMain.c
+++ b/Nt32Pkg/Sec/SecMain.c
@@ -119,7 +119,6 @@ SecPrint (
 \r
   va_start (Marker, Format);\r
   \r
-//  vsprintf (Buffer, Format, Marker);\r
   _vsnprintf (Buffer, sizeof (Buffer), Format, Marker);\r
 \r
   CharCount = strlen (Buffer);\r

diff --git a/Nt32Pkg/Sec/SecMain.h b/Nt32Pkg/Sec/SecMain.h
index a94f1c111e376e187533d8fdd0d6fb69f6be8187..3d2dd2c53eff29a6e08df7c5affc37e67bc11fb2 100644 (file)
--- a/Nt32Pkg/Sec/SecMain.h
+++ b/Nt32Pkg/Sec/SecMain.h
@@ -23,6 +23,7 @@ Abstract:
 #include <PiPei.h>\r
 #include <PiDxe.h>\r
 #include <WinNtPeim.h>\r
+#include <Guid/StatusCodeDataTypeDebug.h>\r
 #include <Library/BaseLib.h>\r
 #include <Library/PeCoffLib.h>\r
 #include <Ppi/NtPeiLoadFile.h>\r
@@ -39,8 +40,6 @@ Abstract:
 \r
 #include <IndustryStandard/PeImage.h>\r
 \r
-#define EFI_STATUS_CODE_DATA_MAX_SIZE 200\r
-\r
 #define STACK_SIZE                0x20000      \r
 \r
 typedef struct {\r

diff --git a/Nt32Pkg/Sec/SecMain.inf b/Nt32Pkg/Sec/SecMain.inf
index c5f6bacaf47d97a0d31861ecc4ccdb4d53e06089..cafa08b41fdbcbd9c6e76b5adc4290ee59d521ee 100644 (file)
--- a/Nt32Pkg/Sec/SecMain.inf
+++ b/Nt32Pkg/Sec/SecMain.inf
@@ -38,6 +38,7 @@
 [Packages]\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r
+  IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec\r
   Nt32Pkg/Nt32Pkg.dec\r
 \r
 [LibraryClasses]\r