summaryrefslogtreecommitdiffstats
path: root/src/usr/diag/prdf/common/plat/pegasus
diff options
context:
space:
mode:
Diffstat (limited to 'src/usr/diag/prdf/common/plat/pegasus')
-rw-r--r--src/usr/diag/prdf/common/plat/pegasus/prdfCalloutUtil.H5
-rwxr-xr-xsrc/usr/diag/prdf/common/plat/pegasus/prdfCenMba.C8
-rw-r--r--src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaDataBundle.H6
-rwxr-xr-xsrc/usr/diag/prdf/common/plat/pegasus/prdfCenMembuf.C6
-rwxr-xr-xsrc/usr/diag/prdf/common/plat/pegasus/prdfCenPll.C16
-rw-r--r--src/usr/diag/prdf/common/plat/pegasus/prdfDramRepairs.C4
-rw-r--r--src/usr/diag/prdf/common/plat/pegasus/prdfMemUtil.C6
-rw-r--r--src/usr/diag/prdf/common/plat/pegasus/prdfMemUtil.H9
-rwxr-xr-xsrc/usr/diag/prdf/common/plat/pegasus/prdfP8Mcs.C2
-rwxr-xr-xsrc/usr/diag/prdf/common/plat/pegasus/prdfP8Pll.C8
-rwxr-xr-xsrc/usr/diag/prdf/common/plat/pegasus/prdfP8Proc.C10
-rw-r--r--src/usr/diag/prdf/common/plat/pegasus/prdfP8SystemSpecific.C6
-rw-r--r--src/usr/diag/prdf/common/plat/pegasus/prdfPegasusConfigurator.C34
-rw-r--r--src/usr/diag/prdf/common/plat/pegasus/prdfPegasusConfigurator.H20
14 files changed, 74 insertions, 66 deletions
diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfCalloutUtil.H b/src/usr/diag/prdf/common/plat/pegasus/prdfCalloutUtil.H
index e74c102bc..0e46ad613 100644
--- a/src/usr/diag/prdf/common/plat/pegasus/prdfCalloutUtil.H
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfCalloutUtil.H
@@ -28,10 +28,11 @@
* @brief Utility functions for common, non-trivial callouts.
*/
-struct STEP_CODE_DATA_STRUCT;
-
namespace PRDF
{
+
+struct STEP_CODE_DATA_STRUCT;
+
namespace CalloutUtil
{
diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfCenMba.C b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMba.C
index f332030a2..2250845ff 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/prdfCenMba.C
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMba.C
@@ -50,7 +50,7 @@ namespace Mba
* @param i_mbaChip A Centaur MBA chip.
* @return SUCCESS
*/
-int32_t Initialize( PrdfExtensibleChip * i_mbaChip )
+int32_t Initialize( ExtensibleChip * i_mbaChip )
{
i_mbaChip->getDataBundle() = new CenMbaDataBundle( i_mbaChip );
return SUCCESS;
@@ -68,7 +68,7 @@ PRDF_PLUGIN_DEFINE( Mba, Initialize );
* done after the framework clears the FIR bits that were at attention.
* @return SUCCESS.
*/
-int32_t PostAnalysis( PrdfExtensibleChip * i_mbaChip,
+int32_t PostAnalysis( ExtensibleChip * i_mbaChip,
STEP_CODE_DATA_STRUCT & i_sc )
{
#ifdef __HOSTBOOT_MODULE
@@ -110,7 +110,7 @@ PRDF_PLUGIN_DEFINE( Mba, PostAnalysis );
* @param i_sc The step code data struct.
* @return SUCCESS
*/
-int32_t MaintCmdComplete( PrdfExtensibleChip * i_mbaChip,
+int32_t MaintCmdComplete( ExtensibleChip * i_mbaChip,
STEP_CODE_DATA_STRUCT & i_sc )
{
using namespace TARGETING;
@@ -150,7 +150,7 @@ PRDF_PLUGIN_DEFINE( Mba, MaintCmdComplete );
* @return SUCCESS
*/
// FIXME: Story 51702 will implement this
-int32_t SkipMbaMsg( PrdfExtensibleChip * i_chip,
+int32_t SkipMbaMsg( ExtensibleChip * i_chip,
STEP_CODE_DATA_STRUCT & i_sc )
{
using namespace TARGETING;
diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaDataBundle.H b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaDataBundle.H
index 9fd12de20..68492268d 100644
--- a/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaDataBundle.H
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaDataBundle.H
@@ -38,7 +38,7 @@ namespace PRDF
/**
* @brief The P7 Centaur MBA data bundle.
*/
-class CenMbaDataBundle : public PrdfDataBundle
+class CenMbaDataBundle : public DataBundle
{
public: // functions
@@ -46,7 +46,7 @@ class CenMbaDataBundle : public PrdfDataBundle
* @brief Constructor.
* @param i_mbaChip The MBA chip.
*/
- explicit CenMbaDataBundle( PrdfExtensibleChip * i_mbaChip ) :
+ explicit CenMbaDataBundle( ExtensibleChip * i_mbaChip ) :
iv_sendCmdCompleteMsg(false)
{}
@@ -75,7 +75,7 @@ class CenMbaDataBundle : public PrdfDataBundle
* @param i_mbaChip The MBA chip.
* @return This MBA's data bundle.
*/
-inline CenMbaDataBundle * getMbaDataBundle( PrdfExtensibleChip * i_mbaChip )
+inline CenMbaDataBundle * getMbaDataBundle( ExtensibleChip * i_mbaChip )
{
return static_cast<CenMbaDataBundle *>(i_mbaChip->getDataBundle());
}
diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfCenMembuf.C b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMembuf.C
index 8282bf55a..ace843f21 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/prdfCenMembuf.C
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMembuf.C
@@ -49,7 +49,7 @@ namespace Membuf
* @param i_mbaChip A Centaur Membuf chip.
* @return SUCCESS
*/
-int32_t Initialize( PrdfExtensibleChip * i_mbaChip )
+int32_t Initialize( ExtensibleChip * i_mbaChip )
{
// FIXME: need to implement
return SUCCESS;
@@ -63,7 +63,7 @@ PRDF_PLUGIN_DEFINE( Membuf, Initialize );
* @brief Used when the chip has a CHECK_STOP attention to check for the
* presence of recovered errors.
*/
-int32_t CheckForRecovered(PrdfExtensibleChip * i_chip,
+int32_t CheckForRecovered(ExtensibleChip * i_chip,
bool & o_hasRecovered)
{
//FIXME: need to fully implement for Membuf
@@ -87,7 +87,7 @@ int32_t CheckForRecovered(PrdfExtensibleChip * i_chip,
* done after the framework clears the FIR bits that were at attention.
* @return SUCCESS.
*/
-int32_t PostAnalysis( PrdfExtensibleChip * i_membufChip,
+int32_t PostAnalysis( ExtensibleChip * i_membufChip,
STEP_CODE_DATA_STRUCT & i_sc )
{
//FIXME: need to implement
diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfCenPll.C b/src/usr/diag/prdf/common/plat/pegasus/prdfCenPll.C
index 4beda7535..4fa8ae3c7 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/prdfCenPll.C
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfCenPll.C
@@ -55,7 +55,7 @@ enum
* @returns Failure or Success of query.
* @note
*/
-int32_t QueryPll( PrdfExtensibleChip * i_chip,
+int32_t QueryPll( ExtensibleChip * i_chip,
bool & o_result)
{
int32_t rc = SUCCESS;
@@ -94,7 +94,7 @@ PRDF_PLUGIN_DEFINE( Membuf, QueryPll );
* @returns Failure or Success of query.
* @note
*/
-int32_t ClearPll( PrdfExtensibleChip * i_chip,
+int32_t ClearPll( ExtensibleChip * i_chip,
STEP_CODE_DATA_STRUCT & i_sc)
{
int32_t rc = SUCCESS;
@@ -120,7 +120,7 @@ PRDF_PLUGIN_DEFINE( Membuf, ClearPll );
* @returns Failure or Success of query.
* @note
*/
-int32_t MaskPll( PrdfExtensibleChip * i_chip,void * unused)
+int32_t MaskPll( ExtensibleChip * i_chip,void * unused)
{
int32_t rc = SUCCESS;
@@ -146,7 +146,7 @@ PRDF_PLUGIN_DEFINE( Membuf, MaskPll );
* @param i_sc The step code data struct.
* @return SUCCESS.
*/
-int32_t CalloutPll( PrdfExtensibleChip * i_chip,
+int32_t CalloutPll( ExtensibleChip * i_chip,
STEP_CODE_DATA_STRUCT & i_sc )
{
// FIXME: RTC: 51628 will address clock target issue
@@ -164,7 +164,7 @@ PRDF_PLUGIN_DEFINE( Membuf, CalloutPll );
@returns Failure Or Success of message call.
@note
*/
-int32_t PllPostAnalysis( PrdfExtensibleChip * i_chip,
+int32_t PllPostAnalysis( ExtensibleChip * i_chip,
STEP_CODE_DATA_STRUCT & i_sc )
{
using namespace TARGETING;
@@ -189,7 +189,7 @@ int32_t PllPostAnalysis( PrdfExtensibleChip * i_chip,
for (TargetHandleList::iterator mbaIt = list.begin(); mbaIt != list.end(); ++mbaIt)
{
// Get the extensible chip for this mba
- PrdfExtensibleChip *l_mbaChip = (PrdfExtensibleChip *)systemPtr->GetChip(*mbaIt);
+ ExtensibleChip *l_mbaChip = (ExtensibleChip *)systemPtr->GetChip(*mbaIt);
//Check to make sure we are at threshold and have something garded.
if( (NULL != l_mbaChip) &&
@@ -197,13 +197,13 @@ int32_t PllPostAnalysis( PrdfExtensibleChip * i_chip,
(i_sc.service_data->QueryGard() != GardResolution::NoGard) )
{
//Call the Skip Maintanence Command on this mba
- PrdfExtensibleChipFunction * l_skipMbaMsg =
+ ExtensibleChipFunction * l_skipMbaMsg =
l_mbaChip->getExtensibleFunction("SkipMbaMsg", true);
// This call will return an error if it doesn't complete.
// Don't fail on error. keep going.
l_rc |= (*l_skipMbaMsg)(l_mbaChip,
- PrdfPluginDef::bindParm<STEP_CODE_DATA_STRUCT &>(i_sc));
+ PluginDef::bindParm<STEP_CODE_DATA_STRUCT &>(i_sc));
}
}
diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfDramRepairs.C b/src/usr/diag/prdf/common/plat/pegasus/prdfDramRepairs.C
index 7d5820656..9131dd9e7 100644
--- a/src/usr/diag/prdf/common/plat/pegasus/prdfDramRepairs.C
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfDramRepairs.C
@@ -446,4 +446,6 @@ int32_t restoreDramRepairs(TargetHandle_t i_mba)
return calloutMade ? FAIL : SUCCESS;
}
-}
+
+} // end namespace PRDF
+
diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfMemUtil.C b/src/usr/diag/prdf/common/plat/pegasus/prdfMemUtil.C
index 46f3486f0..b29217102 100644
--- a/src/usr/diag/prdf/common/plat/pegasus/prdfMemUtil.C
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfMemUtil.C
@@ -39,7 +39,7 @@ namespace MemUtil
#ifdef __HOSTBOOT_MODULE
-int32_t clearHostAttns( PrdfExtensibleChip * i_memChip,
+int32_t clearHostAttns( ExtensibleChip * i_memChip,
STEP_CODE_DATA_STRUCT & i_sc )
{
using namespace TARGETING;
@@ -51,13 +51,13 @@ int32_t clearHostAttns( PrdfExtensibleChip * i_memChip,
do
{
// Get the attached MCS chip.
- PrdfExtensibleChip * mcsChip = i_memChip;
+ ExtensibleChip * mcsChip = i_memChip;
if ( TYPE_MCS != PlatServices::getTargetType(memHandle) )
{
TargetHandleList list = PlatServices::getConnected( memHandle,
TYPE_MCS );
if ( 1 == list.size() )
- mcsChip = (PrdfExtensibleChip *)systemPtr->GetChip( list[0] );
+ mcsChip = (ExtensibleChip *)systemPtr->GetChip( list[0] );
else
{
PRDF_ERR( "[MemUtil::clearHostAttns] getConnected() failed" );
diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfMemUtil.H b/src/usr/diag/prdf/common/plat/pegasus/prdfMemUtil.H
index 03b25ce95..e4c1dcd16 100644
--- a/src/usr/diag/prdf/common/plat/pegasus/prdfMemUtil.H
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfMemUtil.H
@@ -30,11 +30,12 @@
#include <iipconst.h>
-class PrdfExtensibleChip;
-struct STEP_CODE_DATA_STRUCT;
-
namespace PRDF
{
+
+class ExtensibleChip;
+struct STEP_CODE_DATA_STRUCT;
+
namespace MemUtil
{
@@ -47,7 +48,7 @@ namespace MemUtil
* @param i_sc The step code data struct.
* @return Non-SUCCESS for internal errors, SUCCESS otherwise.
*/
-int32_t clearHostAttns( PrdfExtensibleChip * i_memChip,
+int32_t clearHostAttns( ExtensibleChip * i_memChip,
STEP_CODE_DATA_STRUCT & i_sc );
//#endif // __HOSTBOOT_MODULE
diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfP8Mcs.C b/src/usr/diag/prdf/common/plat/pegasus/prdfP8Mcs.C
index a43ae8ea6..3f7b724df 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/prdfP8Mcs.C
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfP8Mcs.C
@@ -45,7 +45,7 @@ namespace Mcs
* @param i_mcsChip An MCS chip.
* @return SUCCESS
*/
-int32_t Initialize( PrdfExtensibleChip * i_mcsChip )
+int32_t Initialize( ExtensibleChip * i_mcsChip )
{
// FIXME: Add proper initialization as per requirement
return SUCCESS;
diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfP8Pll.C b/src/usr/diag/prdf/common/plat/pegasus/prdfP8Pll.C
index b89cae099..04bcc8f14 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/prdfP8Pll.C
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfP8Pll.C
@@ -52,7 +52,7 @@ enum
* @returns Failure or Success of query.
* @note
*/
-int32_t QueryPll( PrdfExtensibleChip * i_chip,
+int32_t QueryPll( ExtensibleChip * i_chip,
bool & o_result)
{
int32_t rc = SUCCESS;
@@ -89,7 +89,7 @@ PRDF_PLUGIN_DEFINE( Proc, QueryPll );
* @returns Failure or Success of query.
* @note
*/
-int32_t ClearPll( PrdfExtensibleChip * i_chip,
+int32_t ClearPll( ExtensibleChip * i_chip,
STEP_CODE_DATA_STRUCT & i_sc)
{
int32_t rc = SUCCESS;
@@ -114,7 +114,7 @@ PRDF_PLUGIN_DEFINE( Proc, ClearPll );
* @returns Failure or Success of query.
* @note
*/
-int32_t MaskPll( PrdfExtensibleChip * i_chip,void * unused)
+int32_t MaskPll( ExtensibleChip * i_chip,void * unused)
{
int32_t rc = SUCCESS;
SCAN_COMM_REGISTER_CLASS * tpmask_or = i_chip->getRegister("TP_LFIR_MASK_OR");
@@ -132,7 +132,7 @@ PRDF_PLUGIN_DEFINE( Proc, MaskPll );
* @param i_sc The step code data struct.
* @return SUCCESS.
*/
-int32_t CalloutPll( PrdfExtensibleChip * i_chip,
+int32_t CalloutPll( ExtensibleChip * i_chip,
STEP_CODE_DATA_STRUCT & i_sc )
{
// FIXME: RTC: 51628 will address clock target issue
diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfP8Proc.C b/src/usr/diag/prdf/common/plat/pegasus/prdfP8Proc.C
index 961b1785a..e4fbc0c32 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/prdfP8Proc.C
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfP8Proc.C
@@ -46,7 +46,7 @@ namespace Proc
* @param i_chip P8 chip.
* @return SUCCESS
*/
-int32_t Initialize( PrdfExtensibleChip * i_chip )
+int32_t Initialize( ExtensibleChip * i_chip )
{
// FIXME: Add proper initialization as per requirement
return SUCCESS;
@@ -113,7 +113,7 @@ static inline bool OnlyMcOrExtCS (SCAN_COMM_REGISTER_CLASS * i_glcs,
* @param o_hasRecovered - true if chip has a recovered that we want to analyze
* @return SUCCESS
*/
-int32_t CheckForRecovered(PrdfExtensibleChip * i_chip,
+int32_t CheckForRecovered(ExtensibleChip * i_chip,
bool & o_hasRecovered)
{
o_hasRecovered = false;
@@ -192,7 +192,7 @@ int32_t CheckForRecovered(PrdfExtensibleChip * i_chip,
* @return SUCCESS
*
*/
-int32_t CheckForRecoveredSev(PrdfExtensibleChip * i_chip,
+int32_t CheckForRecoveredSev(ExtensibleChip * i_chip,
uint32_t & o_sev)
{
SCAN_COMM_REGISTER_CLASS * l_rer = NULL;
@@ -257,7 +257,7 @@ int32_t CheckForRecoveredSev(PrdfExtensibleChip * i_chip,
* @param o_externalChips - List of external fabrics driving checkstop.
* @param o_wofValue - Current WOF value (unused for now).
*/
-int32_t GetCheckstopInfo(PrdfExtensibleChip * i_chip,
+int32_t GetCheckstopInfo(ExtensibleChip * i_chip,
bool & o_wasInternal,
TARGETING::TargetHandleList & o_externalChips,
uint64_t & o_wofValue)
@@ -342,7 +342,7 @@ int32_t GetCheckstopInfo(PrdfExtensibleChip * i_chip,
} PRDF_PLUGIN_DEFINE( Proc, GetCheckstopInfo );
-int32_t CoreConfigured(PrdfExtensibleChip * i_chip,
+int32_t CoreConfigured(ExtensibleChip * i_chip,
bool & o_isCoreConfigured)
{
using namespace TARGETING;
diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfP8SystemSpecific.C b/src/usr/diag/prdf/common/plat/pegasus/prdfP8SystemSpecific.C
index 090770545..8149192f9 100644
--- a/src/usr/diag/prdf/common/plat/pegasus/prdfP8SystemSpecific.C
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfP8SystemSpecific.C
@@ -28,8 +28,10 @@
#include <prdfPegasusConfigurator.H>
#include <prdfPlatServices.H>
+namespace PRDF
+{
-namespace PrdfSystemSpecific
+namespace SystemSpecific
{
PRDF::Configurator * getConfiguratorPtr()
{
@@ -41,3 +43,5 @@ namespace PrdfSystemSpecific
return;
}
};
+
+} // end namespace PRDF
diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfPegasusConfigurator.C b/src/usr/diag/prdf/common/plat/pegasus/prdfPegasusConfigurator.C
index ea0fb5dd3..ace249424 100644
--- a/src/usr/diag/prdf/common/plat/pegasus/prdfPegasusConfigurator.C
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfPegasusConfigurator.C
@@ -103,11 +103,11 @@ System * PegasusConfigurator::build()
System * l_system = new System(noAttnResolution);
// Create domains.
- FabricDomain * l_procDomain = new FabricDomain( FABRIC_DOMAIN );
- PrdfExDomain * l_exDomain = new PrdfExDomain( EX_DOMAIN );
- PrdfMcsDomain * l_mcsDomain = new PrdfMcsDomain( MCS_DOMAIN );
- PrdfMembufDomain * l_membufDomain = new PrdfMembufDomain( MEMBUF_DOMAIN );
- PrdfMbaDomain * l_mbaDomain = new PrdfMbaDomain( MBA_DOMAIN );
+ FabricDomain * l_procDomain = new FabricDomain( FABRIC_DOMAIN );
+ ExDomain * l_exDomain = new ExDomain( EX_DOMAIN );
+ McsDomain * l_mcsDomain = new McsDomain( MCS_DOMAIN );
+ MembufDomain * l_membufDomain = new MembufDomain( MEMBUF_DOMAIN );
+ MbaDomain * l_mbaDomain = new MbaDomain( MBA_DOMAIN );
uint32_t l_maxNodeCount = _getMaxNumNodes();
@@ -148,9 +148,9 @@ System * PegasusConfigurator::build()
//------------------------------------------------------------------------------
-void PegasusConfigurator::addDomainChips( TARGETING::TYPE i_type,
- PrdfRuleChipDomain * io_domain,
- PllDomainList * io_pllDomains )
+void PegasusConfigurator::addDomainChips( TARGETING::TYPE i_type,
+ RuleChipDomain * io_domain,
+ PllDomainList * io_pllDomains )
{
using namespace TARGETING;
@@ -164,11 +164,11 @@ void PegasusConfigurator::addDomainChips( TARGETING::TYPE i_type,
const char * fileName = "";
switch ( i_type )
{
- case TYPE_PROC: fileName = PRDF::Proc; break;
- case TYPE_EX: fileName = PRDF::Ex; break;
- case TYPE_MCS: fileName = PRDF::Mcs; break;
- case TYPE_MEMBUF: fileName = PRDF::Membuf; break;
- case TYPE_MBA: fileName = PRDF::Mba; break;
+ case TYPE_PROC: fileName = Proc; break;
+ case TYPE_EX: fileName = Ex; break;
+ case TYPE_MCS: fileName = Mcs; break;
+ case TYPE_MEMBUF: fileName = Membuf; break;
+ case TYPE_MBA: fileName = Mba; break;
default:
// Print a trace statement, but do not fail the build.
@@ -185,8 +185,8 @@ void PegasusConfigurator::addDomainChips( TARGETING::TYPE i_type,
{
if ( NULL == *itr ) continue;
- PrdfRuleChip * chip = new PrdfRuleChip( fileName, *itr,
- scanFac, resFac );
+ RuleChip * chip = new RuleChip( fileName, *itr,
+ scanFac, resFac );
sysChipLst.push_back( chip );
io_domain->AddChip( chip );
@@ -223,7 +223,7 @@ void PegasusConfigurator::addDomainChips( TARGETING::TYPE i_type,
void PegasusConfigurator::addChipsToPllDomain(
DOMAIN_ID i_domainId,
PllDomainList * io_pllDomains,
- PrdfRuleChip * i_chip,
+ RuleChip * i_chip,
TARGETING::TargetHandle_t i_pTarget,
ScanFacility & i_scanFac,
ResolutionFactory & i_resFac)
@@ -295,4 +295,4 @@ void PegasusConfigurator::addPllDomainsToSystem(
}
}
-} // End namespace PRDF
+} // end namespace PRDF
diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfPegasusConfigurator.H b/src/usr/diag/prdf/common/plat/pegasus/prdfPegasusConfigurator.H
index 4d442993b..4b788ee8b 100644
--- a/src/usr/diag/prdf/common/plat/pegasus/prdfPegasusConfigurator.H
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfPegasusConfigurator.H
@@ -32,11 +32,11 @@
#include <iipCallAttnResolution.h> // For CallAttnResolution
#include <prdfPllDomain.H>
-class PrdfRuleChipDomain;
-
namespace PRDF
{
+class RuleChipDomain;
+
typedef std::vector< PRDF::PllDomain *> PllDomainList;
typedef std::vector< CHIP_CLASS *> PllChipList;
@@ -49,8 +49,8 @@ class PegasusConfigurator : public Configurator
* @brief Constructor
*/
PegasusConfigurator() :
- Configurator( PrdfRuleChipDomain::TOTAL_CHIPS,
- PrdfRuleChipDomain::TOTAL_DOMAINS )
+ Configurator( RuleChipDomain::TOTAL_CHIPS,
+ RuleChipDomain::TOTAL_DOMAINS )
{}
/**
@@ -83,9 +83,9 @@ class PegasusConfigurator : public Configurator
* @parm io_domain The associated domain.
* @parm io_pllDomains The associated PLL domain (optional for some)
*/
- void addDomainChips( TARGETING::TYPE i_type,
- PrdfRuleChipDomain * io_domain,
- PllDomainList * io_pllDomains = NULL );
+ void addDomainChips( TARGETING::TYPE i_type,
+ RuleChipDomain * io_domain,
+ PllDomainList * io_pllDomains = NULL );
/**
* @brief Add chip to its Pll Domain.
@@ -99,7 +99,7 @@ class PegasusConfigurator : public Configurator
void addChipsToPllDomain(
DOMAIN_ID i_domainId,
PllDomainList * io_fabricPllDomains,
- PrdfRuleChip * i_chip,
+ RuleChip * i_chip,
TARGETING::TargetHandle_t i_pTarget,
ScanFacility & i_scanFac,
ResolutionFactory & i_resFac);
@@ -111,7 +111,7 @@ class PegasusConfigurator : public Configurator
*/
void addPllDomainsToSystem(
PllDomainList & i_fabricPllDomains,
- PllDomainList & i_membPllDomains);
+ PllDomainList & i_membPllDomains );
private: // data
@@ -119,6 +119,6 @@ class PegasusConfigurator : public Configurator
};
-} // End namespace PRDF
+} // end namespace PRDF
#endif
OpenPOWER on IntegriCloud