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@8487 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkModulePkg/Include/FrameworkModuleBase.h b/IntelFrameworkModulePkg/Include/FrameworkModuleBase.h
deleted file mode 100644 (file)
index 68fe7ab..0000000
--- a/IntelFrameworkModulePkg/Include/FrameworkModuleBase.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/** @file\r
-\r
-  Root include file for IntelFrameworkModule Package Base type modules\r
-\r
-  This is the include file for any module of type base. Base modules only use \r
-  types defined via this include file and can be ported easily to any \r
-  environment. There are a set of base libraries in the Mde Package that can\r
-  be used to implement base modules.\r
-\r
-Copyright (c) 2006 - 2007, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-\r
-**/\r
-\r
-#ifndef _FRAMEWORK_MODULE_BASE_H_\r
-#define _FRAMEWORK_MODULE_BASE_H_\r
-///\r
-/// This is the max data size including all the headers which can be passed\r
-/// as Status Code data. This data should be multiple of 8 byte\r
-/// to avoid any kind of boundary issue. Also, sum of this data size (inclusive\r
-/// of size of EFI_STATUS_CODE_DATA should not exceed the max record size of\r
-/// data hub\r
-///\r
-#define EFI_STATUS_CODE_DATA_MAX_SIZE 200\r
-\r
-#endif //_FRAMEWORK_MODULE_BASE_H_\r

diff --git a/IntelFrameworkModulePkg/Include/FrameworkModuleDxe.h b/IntelFrameworkModulePkg/Include/FrameworkModuleDxe.h
deleted file mode 100644 (file)
index 862093e..0000000
--- a/IntelFrameworkModulePkg/Include/FrameworkModuleDxe.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/** @file\r
-\r
-  Root include file for IntelFrameworkModule Package DXE_CORE, DXE, SMM, SAL type modules.\r
-\r
-  This is the include file for any module of type base. Base modules only use \r
-  types defined via this include file and can be ported easily to any \r
-  environment. There are a set of base libraries in the Mde Package that can\r
-  be used to implement base modules.\r
-\r
-Copyright (c) 2006 - 2007, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-\r
-**/\r
-\r
-#ifndef _FRAMEWORK_MODULE_DXE_H_\r
-#define _FRAMEWORK_MODULE_DXE_H_\r
-\r
-#include <FrameworkModuleBase.h>\r
-\r
-#endif //_FRAMEWORK_MODULE_DXE_H_\r

diff --git a/IntelFrameworkModulePkg/Include/FrameworkModulePei.h b/IntelFrameworkModulePkg/Include/FrameworkModulePei.h
deleted file mode 100644 (file)
index f9467e8..0000000
--- a/IntelFrameworkModulePkg/Include/FrameworkModulePei.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/** @file\r
-\r
-  Root include file for IntelFrameworkModule Package SEC, PEIM, PEI_CORE type modules.\r
-\r
-  This is the include file for any module of type base. Base modules only use \r
-  types defined via this include file and can be ported easily to any \r
-  environment. There are a set of base libraries in the Mde Package that can\r
-  be used to implement base modules.\r
-\r
-Copyright (c) 2006 - 2007, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-\r
-**/\r
-\r
-#ifndef _FRAMEWORK_MODULE_PEI_H_\r
-#define _FRAMEWORK_MODULE_PEI_H_\r
-\r
-#include <FrameworkModuleBase.h>\r
-\r
-#endif //_FRAMEWORK_MODULE_PEI_H_\r

diff --git a/IntelFrameworkModulePkg/Include/Guid/StatusCodeDataTypeDebug.h b/IntelFrameworkModulePkg/Include/Guid/StatusCodeDataTypeDebug.h
index c9e547312ad9cdff17e934502dd262b5181a1447..46f5c52062f0991822b676f0096f53ae2e618482 100644 (file)
--- a/IntelFrameworkModulePkg/Include/Guid/StatusCodeDataTypeDebug.h
+++ b/IntelFrameworkModulePkg/Include/Guid/StatusCodeDataTypeDebug.h
@@ -23,6 +23,8 @@
 #define EFI_STATUS_CODE_DATA_TYPE_DEBUG_GUID \\r
   { 0x9A4E9246, 0xD553, 0x11D5, { 0x87, 0xE2, 0x00, 0x06, 0x29, 0x45, 0xC3, 0xb9 } }\r
 \r
 #define EFI_STATUS_CODE_DATA_TYPE_DEBUG_GUID \\r
   { 0x9A4E9246, 0xD553, 0x11D5, { 0x87, 0xE2, 0x00, 0x06, 0x29, 0x45, 0xC3, 0xb9 } }\r
 \r

+#define EFI_STATUS_CODE_DATA_MAX_SIZE 200\r
+\r

 typedef struct {\r
   UINT32  ErrorLevel;\r
   //\r
 typedef struct {\r
   UINT32  ErrorLevel;\r
   //\r

diff --git a/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h b/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h
index 7e6e7ba2aeefbf308a980422907eef932c0ca785..f5d9da3c847af2a092be1122e541bfd596fdbd59 100644 (file)
--- a/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h
+++ b/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h
@@ -30,8 +30,6 @@
 #include <Guid/StatusCodeDataTypeDebug.h>\r
 #include <Protocol/StatusCode.h>\r
 \r
 #include <Guid/StatusCodeDataTypeDebug.h>\r
 #include <Protocol/StatusCode.h>\r
 \r

-#include <FrameworkModuleBase.h>\r
-\r

 extern EFI_REPORT_STATUS_CODE  mReportStatusCode;\r
 \r
 /**\r
 extern EFI_REPORT_STATUS_CODE  mReportStatusCode;\r
 \r
 /**\r

diff --git a/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c b/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
index 4fa93170ef300cb973317f36d9cb2627bd7e5854..4898d8126049dc400f3bc4a1683f675f334a92d7 100644 (file)
--- a/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
+++ b/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
@@ -15,7 +15,6 @@
 \r
 \r
 #include <FrameworkPei.h>\r
 \r
 \r
 #include <FrameworkPei.h>\r

-#include <FrameworkModuleBase.h>\r

 #include <Guid/StatusCodeDataTypeId.h>\r
 #include <Guid/StatusCodeDataTypeDebug.h>\r
 \r
 #include <Guid/StatusCodeDataTypeId.h>\r
 #include <Guid/StatusCodeDataTypeDebug.h>\r
 \r

diff --git a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h
index 7708fc4cec30eb53efd20e073fc83ded911a9491..f85d0bf114ca025256308d31663e7090c5711ebd 100644 (file)
--- a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h
+++ b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h
@@ -31,8 +31,6 @@
 #include <Guid/EventGroup.h>\r
 #include <Protocol/StatusCode.h>\r
 \r
 #include <Guid/EventGroup.h>\r
 #include <Protocol/StatusCode.h>\r
 \r

-#include <FrameworkModuleBase.h>\r
-\r

 extern EFI_REPORT_STATUS_CODE  mReportStatusCode;\r
 \r
 /**\r
 extern EFI_REPORT_STATUS_CODE  mReportStatusCode;\r
 \r
 /**\r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.h b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.h
index a609393e99ea7546a2b58402f56ab6cd827ad8fb..50291261e8ea00d24a56984a8f47825ac5a02a47 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.h
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.h
@@ -18,9 +18,9 @@
 \r
 \r
 #include <FrameworkPei.h>\r
 \r
 \r
 #include <FrameworkPei.h>\r

-#include <FrameworkModulePei.h>\r

 #include <Guid/MemoryStatusCodeRecord.h>\r
 #include <Guid/StatusCodeDataTypeId.h>\r
 #include <Guid/MemoryStatusCodeRecord.h>\r
 #include <Guid/StatusCodeDataTypeId.h>\r

+#include <Guid/StatusCodeDataTypeDebug.h>\r

 #include <Ppi/StatusCode.h>\r
 \r
 #include <Library/BaseLib.h>\r
 #include <Ppi/StatusCode.h>\r
 \r
 #include <Library/BaseLib.h>\r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.h b/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.h
index d0fdbedb6f34cf9f64d55356d2a180278a223afa..3ab69789fd3817a92b2419db66a3c48f24cec3a6 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.h
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.h
@@ -17,7 +17,6 @@
 \r
 \r
 #include <FrameworkDxe.h>\r
 \r
 \r
 #include <FrameworkDxe.h>\r

-#include <FrameworkModuleDxe.h>\r

 #include <Guid/DataHubStatusCodeRecord.h>\r
 #include <Protocol/DataHub.h>\r
 #include <Protocol/SerialIo.h>\r
 #include <Guid/DataHubStatusCodeRecord.h>\r
 #include <Protocol/DataHub.h>\r
 #include <Protocol/SerialIo.h>\r