diff options
Diffstat (limited to 'src/usr/diag/prdf/common/framework')
17 files changed, 27 insertions, 20 deletions
diff --git a/src/usr/diag/prdf/common/framework/config/iipSystem.C b/src/usr/diag/prdf/common/framework/config/iipSystem.C index e95fefc02..52b3e46bc 100755 --- a/src/usr/diag/prdf/common/framework/config/iipSystem.C +++ b/src/usr/diag/prdf/common/framework/config/iipSystem.C @@ -47,8 +47,8 @@ #include <iipDomain.h> #include <iipServiceDataCollector.h> #include <iipResolutionFactory.h> -#include <iipglobl.h> #include <prdfPlatServices.H> +#include <prdfGlobal.H> #ifndef __HOSTBOOT_MODULE #include <prdfMfgThresholdMgr.H> diff --git a/src/usr/diag/prdf/common/framework/config/prdfExtensibleDomain.C b/src/usr/diag/prdf/common/framework/config/prdfExtensibleDomain.C index 3b8f5c9fa..e683e12fd 100755 --- a/src/usr/diag/prdf/common/framework/config/prdfExtensibleDomain.C +++ b/src/usr/diag/prdf/common/framework/config/prdfExtensibleDomain.C @@ -28,7 +28,8 @@ #include <prdf_service_codes.H> #include <errlentry.H> #include <prdfPfa5Data.h> -#include <iipglobl.h> +#include <prdfErrlUtil.H> +#include <prdfGlobal.H> namespace PRDF { diff --git a/src/usr/diag/prdf/common/framework/config/prdfFabricDomain.C b/src/usr/diag/prdf/common/framework/config/prdfFabricDomain.C index 9d9f2658a..b6a8ba3e1 100755 --- a/src/usr/diag/prdf/common/framework/config/prdfFabricDomain.C +++ b/src/usr/diag/prdf/common/framework/config/prdfFabricDomain.C @@ -32,7 +32,7 @@ //---------------------------------------------------------------------- #define prdfFabricDomain_C -#include <iipglobl.h> +#include <prdfGlobal.H> #include <iipstep.h> #include <iipsdbug.h> #include <iipErrorRegister.h> diff --git a/src/usr/diag/prdf/common/framework/config/prdfParentDomain.C b/src/usr/diag/prdf/common/framework/config/prdfParentDomain.C index 89d1c3c5d..74febaad1 100755 --- a/src/usr/diag/prdf/common/framework/config/prdfParentDomain.C +++ b/src/usr/diag/prdf/common/framework/config/prdfParentDomain.C @@ -32,7 +32,7 @@ // Includes //---------------------------------------------------------------------- -#include <iipglobl.h> +#include <prdfGlobal.H> #include <iipDomain.h> #include <prdfPllDomain.H> diff --git a/src/usr/diag/prdf/common/framework/config/prdfPllDomain.C b/src/usr/diag/prdf/common/framework/config/prdfPllDomain.C index 8ce117c7a..a777d13e9 100755 --- a/src/usr/diag/prdf/common/framework/config/prdfPllDomain.C +++ b/src/usr/diag/prdf/common/framework/config/prdfPllDomain.C @@ -34,7 +34,7 @@ #include <iipResolution.h> #include <prdfPlatServices.H> #include <prdfPluginDef.H> -#include <iipglobl.h> +#include <prdfGlobal.H> #include <iipSystem.h> namespace PRDF diff --git a/src/usr/diag/prdf/common/framework/register/prdfErrorRegister.C b/src/usr/diag/prdf/common/framework/register/prdfErrorRegister.C index c585dbf5b..9e4689ec9 100755 --- a/src/usr/diag/prdf/common/framework/register/prdfErrorRegister.C +++ b/src/usr/diag/prdf/common/framework/register/prdfErrorRegister.C @@ -47,7 +47,7 @@ #include <iipErrorRegister.h> #include <iipconst.h> -#include <iipglobl.h> +#include <prdfGlobal.H> #undef iipErrorRegister_C namespace PRDF diff --git a/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.C b/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.C index 846df3c2d..55f68d122 100755 --- a/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.C +++ b/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.C @@ -46,10 +46,11 @@ #include <prdfHomRegisterAccess.H> #include <prdf_service_codes.H> #include <iipbits.h> -#include <iipglobl.h> #include <prdfMain.H> #include <prdfPlatServices.H> - +#include <prdfGlobal.H> +#include <prdfErrlUtil.H> +#include <prdfTrace.H> #undef prdfHomRegisterAccess_C diff --git a/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.H b/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.H index 9756d2683..4900fff96 100755 --- a/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.H +++ b/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.H @@ -36,8 +36,8 @@ #include <iipMopRegisterAccess.h> #include <vector> #include <prdfPlatServices.H> -#include <iipglobl.h> - +#include <prdfErrlUtil.H> +#include <prdfGlobal.H> //-------------------------------------------------------------------- // Forward References //-------------------------------------------------------------------- diff --git a/src/usr/diag/prdf/common/framework/register/prdfRegisterCache.H b/src/usr/diag/prdf/common/framework/register/prdfRegisterCache.H index f3f61b4a8..ec7083401 100644 --- a/src/usr/diag/prdf/common/framework/register/prdfRegisterCache.H +++ b/src/usr/diag/prdf/common/framework/register/prdfRegisterCache.H @@ -29,7 +29,7 @@ #include <map> #include <targeting/common/target.H> #include <iipbits.h> -#include <iipglobl.h> +#include <prdfGlobal.H> #include <prdfScanFacility.H> #include <prdfScomRegisterAccess.H> diff --git a/src/usr/diag/prdf/common/framework/resolution/iipResolution.C b/src/usr/diag/prdf/common/framework/resolution/iipResolution.C index a9d65aa62..935cfee23 100755 --- a/src/usr/diag/prdf/common/framework/resolution/iipResolution.C +++ b/src/usr/diag/prdf/common/framework/resolution/iipResolution.C @@ -35,7 +35,7 @@ #include <iipconst.h> #include <CcAutoDeletePointer.h> #include <iipSystem.h> -#include <iipglobl.h> +#include <prdfGlobal.H> //#include <iipCalloutMap.h> #include <iipCalloutResolution.h> #include <iipstep.h> diff --git a/src/usr/diag/prdf/common/framework/resolution/iipResolutionFactory.h b/src/usr/diag/prdf/common/framework/resolution/iipResolutionFactory.h index b0d7becb9..980b9dbbc 100755 --- a/src/usr/diag/prdf/common/framework/resolution/iipResolutionFactory.h +++ b/src/usr/diag/prdf/common/framework/resolution/iipResolutionFactory.h @@ -51,7 +51,7 @@ //-------------------------------------------------------------------- #include <iipconst.h> -#include <iipglobl.h> +#include <prdfGlobal.H> #include <prdfFlyWeight.H> // dg01 #include <prdfFlyWeightS.H> #include <iipCalloutResolution.h> diff --git a/src/usr/diag/prdf/common/framework/rule/prdfRuleChip.C b/src/usr/diag/prdf/common/framework/rule/prdfRuleChip.C index c5d33e8d5..f1a3e26b7 100755 --- a/src/usr/diag/prdf/common/framework/rule/prdfRuleChip.C +++ b/src/usr/diag/prdf/common/framework/rule/prdfRuleChip.C @@ -27,7 +27,8 @@ #include <prdfSdcFileControl.H> //for SyncAnalysis #endif -#include <iipglobl.h> // for SystemPtr. +#include <prdfGlobal.H> // for SystemPtr. +#include <prdfErrlUtil.H> #include <prdfRuleChip.H> #include <prdrLoadChip.H> diff --git a/src/usr/diag/prdf/common/framework/rule/prdrLoadChip.C b/src/usr/diag/prdf/common/framework/rule/prdrLoadChip.C index 93c1e5581..55e87c465 100755 --- a/src/usr/diag/prdf/common/framework/rule/prdrLoadChip.C +++ b/src/usr/diag/prdf/common/framework/rule/prdrLoadChip.C @@ -31,9 +31,9 @@ #include <prdf_service_codes.H> #include <prdfThresholdResolutions.H> -#include <iipglobl.h> +#include <prdfGlobal.H> #include <UtilHash.H> // for Util::hashString - +#include <prdfErrlUtil.H> #include <algorithm> // for std::generate_n namespace Prdr diff --git a/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.C b/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.C index 65a6f49d1..344a06665 100755 --- a/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.C +++ b/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.C @@ -32,9 +32,10 @@ #include <prdfPlatServices.H> -#include <iipglobl.h> +#include <prdfGlobal.H> #include <prdfAssert.h> #include <prdfTrace.H> +#include <prdfErrlUtil.H> #include <dimmBadDqBitmapFuncs.H> // for dimm[S|G]etBadDqBitmap() #include <dram_initialization/mss_memdiag/mss_maint_cmds.H> diff --git a/src/usr/diag/prdf/common/framework/service/prdfTargetServices.C b/src/usr/diag/prdf/common/framework/service/prdfTargetServices.C index 66d3454ea..1369b5577 100755 --- a/src/usr/diag/prdf/common/framework/service/prdfTargetServices.C +++ b/src/usr/diag/prdf/common/framework/service/prdfTargetServices.C @@ -32,7 +32,8 @@ #include <prdfTargetServices.H> -#include <iipglobl.h> +#include <prdfGlobal.H> +#include <prdfErrlUtil.H> #include <prdfTrace.H> #include <fapi.H> diff --git a/src/usr/diag/prdf/common/framework/service/prdf_ras_services.C b/src/usr/diag/prdf/common/framework/service/prdf_ras_services.C index 3eb42974f..1527771f9 100755 --- a/src/usr/diag/prdf/common/framework/service/prdf_ras_services.C +++ b/src/usr/diag/prdf/common/framework/service/prdf_ras_services.C @@ -32,7 +32,8 @@ #include <time.h> #include <iipServiceDataCollector.h> #include <prdf_service_codes.H> -#include <iipglobl.h> +#include <prdfGlobal.H> +#include <prdfErrlUtil.H> #include <prdfCallouts.H> #include <prdfPlatServices.H> diff --git a/src/usr/diag/prdf/common/framework/service/xspprdsdbug.C b/src/usr/diag/prdf/common/framework/service/xspprdsdbug.C index 6679e4562..8cc851ff1 100755 --- a/src/usr/diag/prdf/common/framework/service/xspprdsdbug.C +++ b/src/usr/diag/prdf/common/framework/service/xspprdsdbug.C @@ -49,10 +49,11 @@ #include <iipstep.h> #include <iipServiceDataCollector.h> #include <iipsdbug.h> -#include <iipglobl.h> +#include <prdfGlobal.H> #include <prdf_service_codes.H> #include <prdfBitString.H> #include <prdfPlatServices.H> +#include <prdfErrlUtil.H> #undef xspprdsdbug_C |