diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/usr/diag/prdf/common/plugins/prdfCalloutsData.H | 18 | ||||
-rwxr-xr-x | src/usr/diag/prdf/common/plugins/prdfDramRepairUsrData.H | 16 | ||||
-rw-r--r-- | src/usr/diag/prdf/common/plugins/prdfMemLogParse.C | 11 | ||||
-rwxr-xr-x | src/usr/diag/prdf/common/plugins/prdfMemLogParse.H | 13 | ||||
-rw-r--r-- | src/usr/diag/prdf/common/plugins/prdfMemoryMruData.H | 16 | ||||
-rw-r--r-- | src/usr/diag/prdf/common/plugins/prdfParserEnums.H | 14 | ||||
-rw-r--r-- | src/usr/diag/prdf/common/plugins/prdfParserUtils.C | 14 | ||||
-rw-r--r-- | src/usr/diag/prdf/common/plugins/prdfParserUtils.H | 16 | ||||
-rw-r--r-- | src/usr/diag/prdf/common/plugins/prdfPfa5Data.h | 16 | ||||
-rw-r--r-- | src/usr/diag/prdf/common/plugins/prdfProcLogParse.C | 13 | ||||
-rw-r--r-- | src/usr/diag/prdf/common/plugins/prdfProcLogParse.H | 13 | ||||
-rwxr-xr-x | src/usr/diag/prdf/common/plugins/prdrErrlPluginsSupt.C | 15 | ||||
-rwxr-xr-x | src/usr/diag/prdf/common/plugins/prdrErrlPluginsSupt.H | 15 | ||||
-rwxr-xr-x | src/usr/diag/prdf/common/util/prdfBitString.C | 11 | ||||
-rwxr-xr-x | src/usr/diag/prdf/common/util/prdfBitString.H | 11 |
15 files changed, 108 insertions, 104 deletions
diff --git a/src/usr/diag/prdf/common/plugins/prdfCalloutsData.H b/src/usr/diag/prdf/common/plugins/prdfCalloutsData.H index cef6ad2c8..c741af721 100644 --- a/src/usr/diag/prdf/common/plugins/prdfCalloutsData.H +++ b/src/usr/diag/prdf/common/plugins/prdfCalloutsData.H @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2013,2014 */ +/* Contributors Listed Below - COPYRIGHT 2013,2017 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -32,12 +34,10 @@ namespace PRDF { -#ifdef PRDF_HOSTBOOT_ERRL_PLUGIN +#if defined(PRDF_HOSTBOOT_ERRL_PLUGIN) namespace HOSTBOOT { -#endif - -#ifdef PRDF_FSP_ERRL_PLUGIN +#elif defined(PRDF_FSP_ERRL_PLUGIN) namespace FSP { #endif @@ -57,12 +57,8 @@ enum MruType } // end namespace PRDcalloutData -#ifdef PRDF_HOSTBOOT_ERRL_PLUGIN -} // end namespace HOSTBOOT -#endif - -#ifdef PRDF_FSP_ERRL_PLUGIN -} // end namespace FSP +#if defined(PRDF_HOSTBOOT_ERRL_PLUGIN) || defined(PRDF_FSP_ERRL_PLUGIN) +} // end namespace FSP/HOSTBOOT #endif } // end namespace PRDF diff --git a/src/usr/diag/prdf/common/plugins/prdfDramRepairUsrData.H b/src/usr/diag/prdf/common/plugins/prdfDramRepairUsrData.H index c1d84a40d..2a6e67849 100755 --- a/src/usr/diag/prdf/common/plugins/prdfDramRepairUsrData.H +++ b/src/usr/diag/prdf/common/plugins/prdfDramRepairUsrData.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2013,2016 */ +/* Contributors Listed Below - COPYRIGHT 2013,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -37,12 +37,10 @@ namespace PRDF { -#ifdef PRDF_HOSTBOOT_ERRL_PLUGIN +#if defined(PRDF_HOSTBOOT_ERRL_PLUGIN) namespace HOSTBOOT { -#endif - -#ifdef PRDF_FSP_ERRL_PLUGIN +#elif defined(PRDF_FSP_ERRL_PLUGIN) namespace FSP { #endif @@ -199,12 +197,8 @@ struct DramRepairMbaData } }; -#ifdef PRDF_HOSTBOOT_ERRL_PLUGIN -} // end namespace HOSTBOOT -#endif - -#ifdef PRDF_FSP_ERRL_PLUGIN -} // end namespace FSP +#if defined(PRDF_HOSTBOOT_ERRL_PLUGIN) || defined(PRDF_FSP_ERRL_PLUGIN) +} // end namespace FSP/HOSTBOOT #endif } // end namespace PRDF diff --git a/src/usr/diag/prdf/common/plugins/prdfMemLogParse.C b/src/usr/diag/prdf/common/plugins/prdfMemLogParse.C index bcd44edd1..c7b0d8cff 100644 --- a/src/usr/diag/prdf/common/plugins/prdfMemLogParse.C +++ b/src/usr/diag/prdf/common/plugins/prdfMemLogParse.C @@ -43,12 +43,13 @@ namespace PRDF { -#ifdef PRDF_HOSTBOOT_ERRL_PLUGIN +#if defined(PRDF_HOSTBOOT_ERRL_PLUGIN) namespace HOSTBOOT -#else +{ +#elif defined(PRDF_FSP_ERRL_PLUGIN) namespace FSP -#endif { +#endif using namespace PARSER; using namespace PARSERUTILS; @@ -3500,6 +3501,8 @@ bool parseTdCtlrStateData( uint8_t * i_buffer, uint32_t i_buflen, //------------------------------------------------------------------------------ -} // namespace FSP/HOSTBBOT +#if defined(PRDF_HOSTBOOT_ERRL_PLUGIN) || defined(PRDF_FSP_ERRL_PLUGIN) +} // end namespace FSP/HOSTBOOT +#endif } // end namespace PRDF diff --git a/src/usr/diag/prdf/common/plugins/prdfMemLogParse.H b/src/usr/diag/prdf/common/plugins/prdfMemLogParse.H index 938731171..42ba72e73 100755 --- a/src/usr/diag/prdf/common/plugins/prdfMemLogParse.H +++ b/src/usr/diag/prdf/common/plugins/prdfMemLogParse.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2013,2016 */ +/* Contributors Listed Below - COPYRIGHT 2013,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -37,12 +37,13 @@ class ErrlUsrParser; namespace PRDF { -#ifdef PRDF_HOSTBOOT_ERRL_PLUGIN +#if defined(PRDF_HOSTBOOT_ERRL_PLUGIN) namespace HOSTBOOT -#else +{ +#elif defined(PRDF_FSP_ERRL_PLUGIN) namespace FSP -#endif { +#endif /** * @brief Parses MemoryMru data. @@ -132,7 +133,9 @@ bool parseBadDqBitmap( uint8_t * i_buffer, uint32_t i_buflen, bool parseTdCtlrStateData( uint8_t * i_buffer, uint32_t i_buflen, ErrlUsrParser & i_parser, uint32_t i_sigId ); -} // namespace FSP/HOSTBBOT +#if defined(PRDF_HOSTBOOT_ERRL_PLUGIN) || defined(PRDF_FSP_ERRL_PLUGIN) +} // end namespace FSP/HOSTBOOT +#endif } // end namespace PRDF #endif // __prdfMemLogParse_H diff --git a/src/usr/diag/prdf/common/plugins/prdfMemoryMruData.H b/src/usr/diag/prdf/common/plugins/prdfMemoryMruData.H index 8e0f70e2d..c32e1645e 100644 --- a/src/usr/diag/prdf/common/plugins/prdfMemoryMruData.H +++ b/src/usr/diag/prdf/common/plugins/prdfMemoryMruData.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2013,2016 */ +/* Contributors Listed Below - COPYRIGHT 2013,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -41,12 +41,10 @@ namespace PRDF { -#ifdef PRDF_HOSTBOOT_ERRL_PLUGIN +#if defined(PRDF_HOSTBOOT_ERRL_PLUGIN) namespace HOSTBOOT { -#endif - -#ifdef PRDF_FSP_ERRL_PLUGIN +#elif defined(PRDF_FSP_ERRL_PLUGIN) namespace FSP { #endif @@ -167,12 +165,8 @@ struct ExtendedData }; } // end namespace MemoryMruData -#ifdef PRDF_HOSTBOOT_ERRL_PLUGIN -} // end namespace HOSTBOOT -#endif - -#ifdef PRDF_FSP_ERRL_PLUGIN -} // end namespace FSP +#if defined(PRDF_HOSTBOOT_ERRL_PLUGIN) || defined(PRDF_FSP_ERRL_PLUGIN) +} // end namespace FSP/HOSTBOOT #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 417c82dea..9390fc604 100644 --- a/src/usr/diag/prdf/common/plugins/prdfParserEnums.H +++ b/src/usr/diag/prdf/common/plugins/prdfParserEnums.H @@ -34,12 +34,10 @@ namespace PRDF { -#ifdef PRDF_HOSTBOOT_ERRL_PLUGIN +#if defined(PRDF_HOSTBOOT_ERRL_PLUGIN) namespace HOSTBOOT { -#endif - -#ifdef PRDF_FSP_ERRL_PLUGIN +#elif defined(PRDF_FSP_ERRL_PLUGIN) namespace FSP { #endif @@ -349,12 +347,8 @@ namespace TD_CTLR_DATA }; } // namespace TD_CTLR_DATA -#ifdef PRDF_HOSTBOOT_ERRL_PLUGIN -} // end namespace HOSTBOOT -#endif - -#ifdef PRDF_FSP_ERRL_PLUGIN -} // end namespace FSP +#if defined(PRDF_HOSTBOOT_ERRL_PLUGIN) || defined(PRDF_FSP_ERRL_PLUGIN) +} // end namespace FSP/HOSTBOOT #endif } // end namespace PRDF diff --git a/src/usr/diag/prdf/common/plugins/prdfParserUtils.C b/src/usr/diag/prdf/common/plugins/prdfParserUtils.C index 42b39cdc1..63060cb4f 100644 --- a/src/usr/diag/prdf/common/plugins/prdfParserUtils.C +++ b/src/usr/diag/prdf/common/plugins/prdfParserUtils.C @@ -28,12 +28,10 @@ namespace PRDF { -#ifdef PRDF_HOSTBOOT_ERRL_PLUGIN +#if defined(PRDF_HOSTBOOT_ERRL_PLUGIN) namespace HOSTBOOT { -#endif - -#ifdef PRDF_FSP_ERRL_PLUGIN +#elif defined(PRDF_FSP_ERRL_PLUGIN) namespace FSP { #endif @@ -213,12 +211,8 @@ uint8_t symbol2Byte<TARGETING::TYPE_MCA>( uint8_t i_symbol ) } // namespace PARSERUTILS -#ifdef PRDF_HOSTBOOT_ERRL_PLUGIN -} // end namespace HOSTBOOT -#endif - -#ifdef PRDF_FSP_ERRL_PLUGIN -} // end namespace FSP +#if defined(PRDF_HOSTBOOT_ERRL_PLUGIN) || defined(PRDF_FSP_ERRL_PLUGIN) +} // end namespace FSP/HOSTBOOT #endif } // End of namespace PRDF diff --git a/src/usr/diag/prdf/common/plugins/prdfParserUtils.H b/src/usr/diag/prdf/common/plugins/prdfParserUtils.H index 3a5a44c0e..1a17c787b 100644 --- a/src/usr/diag/prdf/common/plugins/prdfParserUtils.H +++ b/src/usr/diag/prdf/common/plugins/prdfParserUtils.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2014,2016 */ +/* Contributors Listed Below - COPYRIGHT 2014,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -38,12 +38,10 @@ namespace PRDF { -#ifdef PRDF_HOSTBOOT_ERRL_PLUGIN +#if defined(PRDF_HOSTBOOT_ERRL_PLUGIN) namespace HOSTBOOT { -#endif - -#ifdef PRDF_FSP_ERRL_PLUGIN +#elif defined(PRDF_FSP_ERRL_PLUGIN) namespace FSP { #endif @@ -105,12 +103,8 @@ uint8_t symbol2Byte( uint8_t i_symbol ); } // namespace PARSERUTILS -#ifdef PRDF_HOSTBOOT_ERRL_PLUGIN -} // end namespace HOSTBOOT -#endif - -#ifdef PRDF_FSP_ERRL_PLUGIN -} // end namespace FSP +#if defined(PRDF_HOSTBOOT_ERRL_PLUGIN) || defined(PRDF_FSP_ERRL_PLUGIN) +} // end namespace FSP/HOSTBOOT #endif } // End of namespace PRDF diff --git a/src/usr/diag/prdf/common/plugins/prdfPfa5Data.h b/src/usr/diag/prdf/common/plugins/prdfPfa5Data.h index d19f1e0bf..df47d1804 100644 --- a/src/usr/diag/prdf/common/plugins/prdfPfa5Data.h +++ b/src/usr/diag/prdf/common/plugins/prdfPfa5Data.h @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2013,2016 */ +/* Contributors Listed Below - COPYRIGHT 2013,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -36,12 +36,10 @@ namespace PRDF { -#ifdef PRDF_HOSTBOOT_ERRL_PLUGIN +#if defined(PRDF_HOSTBOOT_ERRL_PLUGIN) namespace HOSTBOOT { -#endif - -#ifdef PRDF_FSP_ERRL_PLUGIN +#elif defined(PRDF_FSP_ERRL_PLUGIN) namespace FSP { #endif @@ -302,12 +300,8 @@ struct CaptureDataClass uint8_t CaptureData[CaptureDataSize]; // MAKMAK Can this be variable size? }; -#ifdef PRDF_HOSTBOOT_ERRL_PLUGIN -} // end namespace HOSTBOOT -#endif - -#ifdef PRDF_FSP_ERRL_PLUGIN -} // end namespace FSP +#if defined(PRDF_HOSTBOOT_ERRL_PLUGIN) || defined(PRDF_FSP_ERRL_PLUGIN) +} // end namespace FSP/HOSTBOOT #endif } // end namespace PRDF diff --git a/src/usr/diag/prdf/common/plugins/prdfProcLogParse.C b/src/usr/diag/prdf/common/plugins/prdfProcLogParse.C index 8910f9e43..1422548e1 100644 --- a/src/usr/diag/prdf/common/plugins/prdfProcLogParse.C +++ b/src/usr/diag/prdf/common/plugins/prdfProcLogParse.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2014,2015 */ +/* Contributors Listed Below - COPYRIGHT 2014,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -39,12 +39,13 @@ namespace PRDF { -#ifdef PRDF_HOSTBOOT_ERRL_PLUGIN +#if defined(PRDF_HOSTBOOT_ERRL_PLUGIN) namespace HOSTBOOT -#else +{ +#elif defined(PRDF_FSP_ERRL_PLUGIN) namespace FSP -#endif { +#endif using namespace PARSER; using namespace TOD; @@ -276,6 +277,8 @@ bool parseL3LdCrFfdc( uint8_t * i_buffer, uint32_t i_buflen, return o_rc; } -} // namespace FSP/HOSTBBOT +#if defined(PRDF_HOSTBOOT_ERRL_PLUGIN) || defined(PRDF_FSP_ERRL_PLUGIN) +} // end namespace FSP/HOSTBOOT +#endif } // end namespace PRDF diff --git a/src/usr/diag/prdf/common/plugins/prdfProcLogParse.H b/src/usr/diag/prdf/common/plugins/prdfProcLogParse.H index af6f27666..1bff38b85 100644 --- a/src/usr/diag/prdf/common/plugins/prdfProcLogParse.H +++ b/src/usr/diag/prdf/common/plugins/prdfProcLogParse.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2014,2015 */ +/* Contributors Listed Below - COPYRIGHT 2014,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -36,12 +36,13 @@ class ErrlUsrParser; namespace PRDF { -#ifdef PRDF_HOSTBOOT_ERRL_PLUGIN +#if defined(PRDF_HOSTBOOT_ERRL_PLUGIN) namespace HOSTBOOT -#else +{ +#elif defined(PRDF_FSP_ERRL_PLUGIN) namespace FSP -#endif { +#endif /** * @brief Parses the SLW FFDC data section. @@ -73,7 +74,9 @@ bool parseL2LdCrFfdc( uint8_t * i_buffer, uint32_t i_buflen, bool parseL3LdCrFfdc( uint8_t * i_buffer, uint32_t i_buflen, ErrlUsrParser & i_parser ); -} // namespace FSP/HOSTBBOT +#if defined(PRDF_HOSTBOOT_ERRL_PLUGIN) || defined(PRDF_FSP_ERRL_PLUGIN) +} // end namespace FSP/HOSTBOOT +#endif } // end namespace PRDF #endif // __prdfProcLogParse_H diff --git a/src/usr/diag/prdf/common/plugins/prdrErrlPluginsSupt.C b/src/usr/diag/prdf/common/plugins/prdrErrlPluginsSupt.C index 61aed240d..cc4bb992f 100755 --- a/src/usr/diag/prdf/common/plugins/prdrErrlPluginsSupt.C +++ b/src/usr/diag/prdf/common/plugins/prdrErrlPluginsSupt.C @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2005,2014 */ +/* Contributors Listed Below - COPYRIGHT 2005,2017 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -26,12 +28,13 @@ namespace PRDF { -#ifdef PRDF_HOSTBOOT_ERRL_PLUGIN +#if defined(PRDF_HOSTBOOT_ERRL_PLUGIN) namespace HOSTBOOT -#else +{ +#elif defined(PRDF_FSP_ERRL_PLUGIN) namespace FSP -#endif { +#endif PrdrRegIdTable & GetRegisterIdTable() { static PrdrRegIdTable l_idTable = PrdrRegIdTable(); @@ -44,5 +47,7 @@ PrdrErrSigTable & GetErrorSigTable() return l_sigTable; } -} // namespace FSP/HOSTBBOT +#if defined(PRDF_HOSTBOOT_ERRL_PLUGIN) || defined(PRDF_FSP_ERRL_PLUGIN) +} // end namespace FSP/HOSTBOOT +#endif } // end namespace PRDF diff --git a/src/usr/diag/prdf/common/plugins/prdrErrlPluginsSupt.H b/src/usr/diag/prdf/common/plugins/prdrErrlPluginsSupt.H index 35d204d1d..50c4d519d 100755 --- a/src/usr/diag/prdf/common/plugins/prdrErrlPluginsSupt.H +++ b/src/usr/diag/prdf/common/plugins/prdrErrlPluginsSupt.H @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2005,2014 */ +/* Contributors Listed Below - COPYRIGHT 2005,2017 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -146,12 +148,13 @@ namespace PRDF { -#ifdef PRDF_HOSTBOOT_ERRL_PLUGIN +#if defined(PRDF_HOSTBOOT_ERRL_PLUGIN) namespace HOSTBOOT -#else +{ +#elif defined(PRDF_FSP_ERRL_PLUGIN) namespace FSP -#endif { +#endif typedef std::map<__PRDR_PLUGIN_IDTYPE, std::string> PrdrErrSigEntries; typedef std::map<__PRDR_PLUGIN_HOMTYPE, PrdrErrSigEntries> PrdrErrSigTable; @@ -168,7 +171,9 @@ typedef std::map<__PRDR_PLUGIN_HOMTYPE, PrdrRegIdEntries> PrdrRegIdTable; PrdrRegIdTable & GetRegisterIdTable(); PrdrErrSigTable & GetErrorSigTable(); -} // namespace FSP/HOSTBBOT +#if defined(PRDF_HOSTBOOT_ERRL_PLUGIN) || defined(PRDF_FSP_ERRL_PLUGIN) +} // end namespace FSP/HOSTBOOT +#endif } // end namespace PRDF #endif diff --git a/src/usr/diag/prdf/common/util/prdfBitString.C b/src/usr/diag/prdf/common/util/prdfBitString.C index 73572a4db..bfabb21cd 100755 --- a/src/usr/diag/prdf/common/util/prdfBitString.C +++ b/src/usr/diag/prdf/common/util/prdfBitString.C @@ -35,6 +35,14 @@ namespace PRDF { +#if defined(PRDF_HOSTBOOT_ERRL_PLUGIN) +namespace HOSTBOOT +{ +#elif defined(PRDF_FSP_ERRL_PLUGIN) +namespace FSP +{ +#endif + //############################################################################## // BitString class @@ -484,5 +492,8 @@ std::ostream & operator<<(std::ostream & out, #endif +#if defined(PRDF_HOSTBOOT_ERRL_PLUGIN) || defined(PRDF_FSP_ERRL_PLUGIN) +} // end namespace FSP/HOSTBOOT +#endif } // end namespace PRDF diff --git a/src/usr/diag/prdf/common/util/prdfBitString.H b/src/usr/diag/prdf/common/util/prdfBitString.H index bd2e45eae..8f77792fe 100755 --- a/src/usr/diag/prdf/common/util/prdfBitString.H +++ b/src/usr/diag/prdf/common/util/prdfBitString.H @@ -43,6 +43,14 @@ namespace PRDF { +#if defined(PRDF_HOSTBOOT_ERRL_PLUGIN) +namespace HOSTBOOT +{ +#elif defined(PRDF_FSP_ERRL_PLUGIN) +namespace FSP +{ +#endif + class BitStringBuffer; @@ -453,6 +461,9 @@ std::ostream & operator<<( std::ostream & out, #endif +#if defined(PRDF_HOSTBOOT_ERRL_PLUGIN) || defined(PRDF_FSP_ERRL_PLUGIN) +} // end namespace FSP/HOSTBOOT +#endif } // end namespace PRDF #endif |