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

9 files changed, 3 insertions, 91 deletions

diff --git a/IntelFrameworkModulePkg/Include/FrameworkModuleBase.h b/IntelFrameworkModulePkg/Include/FrameworkModuleBase.h
deleted file mode 100644
index 68fe7abe6f..0000000000
--- a/IntelFrameworkModulePkg/Include/FrameworkModuleBase.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/** @file

-

-  Root include file for IntelFrameworkModule Package Base type modules

-

-  This is the include file for any module of type base. Base modules only use 

-  types defined via this include file and can be ported easily to any 

-  environment. There are a set of base libraries in the Mde Package that can

-  be used to implement base modules.

-

-Copyright (c) 2006 - 2007, Intel Corporation

-All rights reserved. This program and the accompanying materials

-are licensed and made available under the terms and conditions of the BSD License

-which accompanies this distribution.  The full text of the license may be found at

-http://opensource.org/licenses/bsd-license.php

-

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-

-**/

-

-#ifndef _FRAMEWORK_MODULE_BASE_H_

-#define _FRAMEWORK_MODULE_BASE_H_

-///

-/// This is the max data size including all the headers which can be passed

-/// as Status Code data. This data should be multiple of 8 byte

-/// to avoid any kind of boundary issue. Also, sum of this data size (inclusive

-/// of size of EFI_STATUS_CODE_DATA should not exceed the max record size of

-/// data hub

-///

-#define EFI_STATUS_CODE_DATA_MAX_SIZE 200

-

-#endif //_FRAMEWORK_MODULE_BASE_H_

diff --git a/IntelFrameworkModulePkg/Include/FrameworkModuleDxe.h b/IntelFrameworkModulePkg/Include/FrameworkModuleDxe.h
deleted file mode 100644
index 862093e6f9..0000000000
--- a/IntelFrameworkModulePkg/Include/FrameworkModuleDxe.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/** @file

-

-  Root include file for IntelFrameworkModule Package DXE_CORE, DXE, SMM, SAL type modules.

-

-  This is the include file for any module of type base. Base modules only use 

-  types defined via this include file and can be ported easily to any 

-  environment. There are a set of base libraries in the Mde Package that can

-  be used to implement base modules.

-

-Copyright (c) 2006 - 2007, Intel Corporation

-All rights reserved. This program and the accompanying materials

-are licensed and made available under the terms and conditions of the BSD License

-which accompanies this distribution.  The full text of the license may be found at

-http://opensource.org/licenses/bsd-license.php

-

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-

-**/

-

-#ifndef _FRAMEWORK_MODULE_DXE_H_

-#define _FRAMEWORK_MODULE_DXE_H_

-

-#include <FrameworkModuleBase.h>

-

-#endif //_FRAMEWORK_MODULE_DXE_H_

diff --git a/IntelFrameworkModulePkg/Include/FrameworkModulePei.h b/IntelFrameworkModulePkg/Include/FrameworkModulePei.h
deleted file mode 100644
index f9467e8b99..0000000000
--- a/IntelFrameworkModulePkg/Include/FrameworkModulePei.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/** @file

-

-  Root include file for IntelFrameworkModule Package SEC, PEIM, PEI_CORE type modules.

-

-  This is the include file for any module of type base. Base modules only use 

-  types defined via this include file and can be ported easily to any 

-  environment. There are a set of base libraries in the Mde Package that can

-  be used to implement base modules.

-

-Copyright (c) 2006 - 2007, Intel Corporation

-All rights reserved. This program and the accompanying materials

-are licensed and made available under the terms and conditions of the BSD License

-which accompanies this distribution.  The full text of the license may be found at

-http://opensource.org/licenses/bsd-license.php

-

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-

-**/

-

-#ifndef _FRAMEWORK_MODULE_PEI_H_

-#define _FRAMEWORK_MODULE_PEI_H_

-

-#include <FrameworkModuleBase.h>

-

-#endif //_FRAMEWORK_MODULE_PEI_H_

diff --git a/IntelFrameworkModulePkg/Include/Guid/StatusCodeDataTypeDebug.h b/IntelFrameworkModulePkg/Include/Guid/StatusCodeDataTypeDebug.h
index c9e547312a..46f5c52062 100644
--- a/IntelFrameworkModulePkg/Include/Guid/StatusCodeDataTypeDebug.h
+++ b/IntelFrameworkModulePkg/Include/Guid/StatusCodeDataTypeDebug.h
@@ -23,6 +23,8 @@
 #define EFI_STATUS_CODE_DATA_TYPE_DEBUG_GUID \

   { 0x9A4E9246, 0xD553, 0x11D5, { 0x87, 0xE2, 0x00, 0x06, 0x29, 0x45, 0xC3, 0xb9 } }

 

+#define EFI_STATUS_CODE_DATA_MAX_SIZE 200

+

 typedef struct {

   UINT32  ErrorLevel;

   //

diff --git a/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h b/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h
index 7e6e7ba2ae..f5d9da3c84 100644
--- a/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h
+++ b/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h
@@ -30,8 +30,6 @@
 #include <Guid/StatusCodeDataTypeDebug.h>

 #include <Protocol/StatusCode.h>

 

-#include <FrameworkModuleBase.h>

-

 extern EFI_REPORT_STATUS_CODE  mReportStatusCode;

 

 /**

diff --git a/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c b/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
index 4fa93170ef..4898d81260 100644
--- a/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
+++ b/IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/DebugLib.c
@@ -15,7 +15,6 @@
 

 

 #include <FrameworkPei.h>

-#include <FrameworkModuleBase.h>

 #include <Guid/StatusCodeDataTypeId.h>

 #include <Guid/StatusCodeDataTypeDebug.h>

 

diff --git a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h
index 7708fc4cec..f85d0bf114 100644
--- a/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h
+++ b/IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h
@@ -31,8 +31,6 @@
 #include <Guid/EventGroup.h>

 #include <Protocol/StatusCode.h>

 

-#include <FrameworkModuleBase.h>

-

 extern EFI_REPORT_STATUS_CODE  mReportStatusCode;

 

 /**

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.h b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.h
index a609393e99..50291261e8 100644
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.h
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.h
@@ -18,9 +18,9 @@
 

 

 #include <FrameworkPei.h>

-#include <FrameworkModulePei.h>

 #include <Guid/MemoryStatusCodeRecord.h>

 #include <Guid/StatusCodeDataTypeId.h>

+#include <Guid/StatusCodeDataTypeDebug.h>

 #include <Ppi/StatusCode.h>

 

 #include <Library/BaseLib.h>

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.h b/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.h
index d0fdbedb6f..3ab69789fd 100644
--- a/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.h
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.h
@@ -17,7 +17,6 @@
 

 

 #include <FrameworkDxe.h>

-#include <FrameworkModuleDxe.h>

 #include <Guid/DataHubStatusCodeRecord.h>

 #include <Protocol/DataHub.h>

 #include <Protocol/SerialIo.h>