From 3a0853d0a62b8533f1aaf150f2896b0d489d11d3 Mon Sep 17 00:00:00 2001 From: Chris Phan Date: Fri, 9 Nov 2012 16:35:18 -0600 Subject: Fix callout checking issue in PRD simulator Change-Id: I2e6bf2f09b4eb670aa19f7a5a3fd0467030dae07 RTC: 51614 Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/2293 Reviewed-by: Christopher T. Phan Reviewed-by: Bradley W. Bishop Tested-by: Jenkins Server Reviewed-by: A. Patrick Williams III Reviewed-by: Zane Shelley Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/2474 --- .../diag/prdf/common/framework/resolution/prdfCalloutMap.H | 12 ++++++++++++ src/usr/diag/prdf/common/plat/pegasus/Proc_acts_PB.rule | 1 + 2 files changed, 13 insertions(+) (limited to 'src') diff --git a/src/usr/diag/prdf/common/framework/resolution/prdfCalloutMap.H b/src/usr/diag/prdf/common/framework/resolution/prdfCalloutMap.H index a6b4ba8bf..19eee40ba 100644 --- a/src/usr/diag/prdf/common/framework/resolution/prdfCalloutMap.H +++ b/src/usr/diag/prdf/common/framework/resolution/prdfCalloutMap.H @@ -30,8 +30,10 @@ //------------------------------------------------------------------------------ +#ifndef PRDF_SIM_ENUMS // needed to compile prdfsimEnumMap.C namespace PRDF { +#endif //------------------------------------------------------------------------------ @@ -52,6 +54,10 @@ namespace PRDF { NULL , (SymbolicFru) 0 } \ }; +#elif defined PRDF_SIM_ENUMS + + // included from prdfsimEnumMap.C, nothing for now + #else #define PRDF_SYM_CALLOUT_MAP_BEGIN \ @@ -103,6 +109,10 @@ PRDF_SYM_CALLOUT_MAP_END { NULL , (CalloutPriorityEnum) 0 } \ }; +#elif defined PRDF_SIM_ENUMS + + // included from prdfsimEnumMap.C, nothing for now + #else #define PRDF_CALLOUT_PRIORITY_MAP_BEGIN \ @@ -134,7 +144,9 @@ PRDF_CALLOUT_PRIORITY_MAP_END //------------------------------------------------------------------------------ +#ifndef PRDF_SIM_ENUMS } // end namespace PRDF +#endif #endif // __prdfCalloutMap_H diff --git a/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_PB.rule b/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_PB.rule index 6c46c0e98..c44ec46d6 100755 --- a/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_PB.rule +++ b/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_PB.rule @@ -2457,5 +2457,6 @@ group gIomcFir_1 filter singlebit */ actionclass analyzeMpIPL { + TBDDefaultCallout; funccall("analyzeMpIPL"); }; -- cgit v1.2.1