From 158ba8f3ae85b7da0d2a18be65e91d1a43c3d9a4 Mon Sep 17 00:00:00 2001 From: Sachin Gupta Date: Tue, 29 Oct 2013 15:53:51 +0530 Subject: PRD: Preventive Namespace addition in PRD errl plugins These changes are required as there is some time gap between PRD code release on FSP and HB code release. Because of this, there are incmpatible copies of these files in a build. These changes will avoid conflicts in such cases. Change-Id: I4578ac212538e057f1738bac684b9e158f7a543f Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/6934 Tested-by: Jenkins Server Reviewed-by: Christopher T. Phan Reviewed-by: A. Patrick Williams III Reviewed-by: Zane Shelley Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/7213 --- src/usr/diag/prdf/common/plugins/prdfCalloutsData.H | 16 ++++++++++++++++ src/usr/diag/prdf/common/plugins/prdfCenLogParse.C | 4 ++-- src/usr/diag/prdf/common/plugins/prdfGardType.H | 17 +++++++++++++++++ src/usr/diag/prdf/common/plugins/prdfLogParse_common.C | 6 ++---- src/usr/diag/prdf/common/plugins/prdfMemoryMruData.H | 16 ++++++++++++++++ src/usr/diag/prdf/common/plugins/prdfParserEnums.H | 16 ++++++++++++++++ 6 files changed, 69 insertions(+), 6 deletions(-) diff --git a/src/usr/diag/prdf/common/plugins/prdfCalloutsData.H b/src/usr/diag/prdf/common/plugins/prdfCalloutsData.H index 47556503c..dbe792464 100644 --- a/src/usr/diag/prdf/common/plugins/prdfCalloutsData.H +++ b/src/usr/diag/prdf/common/plugins/prdfCalloutsData.H @@ -32,6 +32,15 @@ namespace PRDF { +#ifdef PRDF_HOSTBOOT_ERRL_PLUGIN +namespace HOSTBOOT +{ +#endif + +#ifdef PRDF_FSP_ERRL_PLUGIN +namespace FSP +{ +#endif namespace PRDcalloutData { @@ -46,6 +55,13 @@ enum MruType } // end namespace PRDcalloutData +#ifdef PRDF_HOSTBOOT_ERRL_PLUGIN +} // end namespace HOSTBOOT +#endif + +#ifdef PRDF_FSP_ERRL_PLUGIN +} // end namespace FSP +#endif } // end namespace PRDF #endif // __prdfCalloutsData_H diff --git a/src/usr/diag/prdf/common/plugins/prdfCenLogParse.C b/src/usr/diag/prdf/common/plugins/prdfCenLogParse.C index 6d73f6ab6..5a28b998a 100644 --- a/src/usr/diag/prdf/common/plugins/prdfCenLogParse.C +++ b/src/usr/diag/prdf/common/plugins/prdfCenLogParse.C @@ -38,8 +38,6 @@ namespace PRDF { -using namespace PARSER; - #ifdef PRDF_HOSTBOOT_ERRL_PLUGIN namespace HOSTBOOT #else @@ -47,6 +45,8 @@ namespace FSP #endif { +using namespace PARSER; + //------------------------------------------------------------------------------ // Helper functions //------------------------------------------------------------------------------ diff --git a/src/usr/diag/prdf/common/plugins/prdfGardType.H b/src/usr/diag/prdf/common/plugins/prdfGardType.H index e4f3bc784..3b55e504b 100644 --- a/src/usr/diag/prdf/common/plugins/prdfGardType.H +++ b/src/usr/diag/prdf/common/plugins/prdfGardType.H @@ -26,6 +26,16 @@ namespace PRDF { +#ifdef PRDF_HOSTBOOT_ERRL_PLUGIN +namespace HOSTBOOT +{ +#endif + +#ifdef PRDF_FSP_ERRL_PLUGIN +namespace FSP +{ +#endif + namespace GardAction { enum ErrorType @@ -57,6 +67,13 @@ namespace GardAction } // end namespace GardAction +#ifdef PRDF_HOSTBOOT_ERRL_PLUGIN +} // end namespace HOSTBOOT +#endif + +#ifdef PRDF_FSP_ERRL_PLUGIN +} // end namespace FSP +#endif } // end namespace PRDF #endif /* prdfGardType_H */ diff --git a/src/usr/diag/prdf/common/plugins/prdfLogParse_common.C b/src/usr/diag/prdf/common/plugins/prdfLogParse_common.C index ea32141eb..784d5025e 100644 --- a/src/usr/diag/prdf/common/plugins/prdfLogParse_common.C +++ b/src/usr/diag/prdf/common/plugins/prdfLogParse_common.C @@ -57,6 +57,7 @@ #endif #include +#include //------------------------------------------------------------------------------ // Data structures @@ -74,7 +75,6 @@ namespace FSP #define PRDF_COMPRESSBUFFER_UNCOMPRESS_FUNCTIONS #include -#include // Default tables for undefined Chips ErrorCodeDescription g_defaultErrorCodes[] = @@ -454,9 +454,7 @@ bool parsePfaData( void * i_buffer, uint32_t i_buflen, i_parser.PrintString( "ERRL Severity", tmp ); // GARD info - // Need to use PRDF namespace as we have included prdfGardType.H - // in nested PRDF namespace - tmpStr = PRDF::GardAction::ToString( pfa.prdGardErrType ); + tmpStr = GardAction::ToString( pfa.prdGardErrType ); snprintf( tmp, 50, "%s (0x%X) ", tmpStr, pfa.prdGardErrType ); i_parser.PrintString( "PRD GARD Error Type", tmp ); i_parser.PrintNumber( "HWAS GARD State", "0x%02X", pfa.hwasGardState ); diff --git a/src/usr/diag/prdf/common/plugins/prdfMemoryMruData.H b/src/usr/diag/prdf/common/plugins/prdfMemoryMruData.H index 8fe4951db..92a3631ef 100644 --- a/src/usr/diag/prdf/common/plugins/prdfMemoryMruData.H +++ b/src/usr/diag/prdf/common/plugins/prdfMemoryMruData.H @@ -34,6 +34,15 @@ namespace PRDF { +#ifdef PRDF_HOSTBOOT_ERRL_PLUGIN +namespace HOSTBOOT +{ +#endif + +#ifdef PRDF_FSP_ERRL_PLUGIN +namespace FSP +{ +#endif namespace MemoryMruData { @@ -115,6 +124,13 @@ union MemMruMeld }; } // end namespace MemoryMruData +#ifdef PRDF_HOSTBOOT_ERRL_PLUGIN +} // end namespace HOSTBOOT +#endif + +#ifdef PRDF_FSP_ERRL_PLUGIN +} // end namespace FSP +#endif } // end namespace PRDF diff --git a/src/usr/diag/prdf/common/plugins/prdfParserEnums.H b/src/usr/diag/prdf/common/plugins/prdfParserEnums.H index b049d0e5b..5592b3339 100644 --- a/src/usr/diag/prdf/common/plugins/prdfParserEnums.H +++ b/src/usr/diag/prdf/common/plugins/prdfParserEnums.H @@ -32,6 +32,15 @@ namespace PRDF { +#ifdef PRDF_HOSTBOOT_ERRL_PLUGIN +namespace HOSTBOOT +{ +#endif + +#ifdef PRDF_FSP_ERRL_PLUGIN +namespace FSP +{ +#endif namespace PARSER { @@ -100,6 +109,13 @@ namespace DQ_BITMAP }; } // namespace DQ_BITMAP +#ifdef PRDF_HOSTBOOT_ERRL_PLUGIN +} // end namespace HOSTBOOT +#endif + +#ifdef PRDF_FSP_ERRL_PLUGIN +} // end namespace FSP +#endif } // end namespace PRDF -- cgit v1.2.1