Encapsulated PRD codebase with PRDF namespace

RTC: 51223
Change-Id: Ie074cb409083d7b04edeba75d39977eb90082d05
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/2196
Reviewed-by: Zane Shelley <zshelle@us.ibm.com>
Tested-by: Jenkins Server
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/2436
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

20 files changed, 113 insertions, 129 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
diff --git a/src/usr/diag/prdf/common/plat/prdfL3Table.C b/src/usr/diag/prdf/common/plat/prdfL3Table.C
index 5bacecb2b..db44dee0e 100755
--- a/src/usr/diag/prdf/common/plat/prdfL3Table.C
+++ b/src/usr/diag/prdf/common/plat/prdfL3Table.C
@@ -41,9 +41,12 @@
 // Member Function Specifications
 //-------------------------------------------------------------------------------------------------
 
+namespace PRDF
+{
+
 //-------------------------------------------------------------------------------------------------
 
-int32_t prdfL3TableAdd(TARGETING::TargetHandle_t i_pl3targetHandle, uint32_t address)
+int32_t L3TableAdd(TARGETING::TargetHandle_t i_pl3targetHandle, uint32_t address)
 {
   int32_t rc = 0;
   return rc;
@@ -51,7 +54,7 @@ int32_t prdfL3TableAdd(TARGETING::TargetHandle_t i_pl3targetHandle, uint32_t add
 
 //-------------------------------------------------------------------------------------------------
 
-void prdfL3TableGet(TARGETING::TargetHandle_t i_pl3targetHandle, uint32_t table[LineDeleteTableSize])
+void L3TableGet(TARGETING::TargetHandle_t i_pl3targetHandle, uint32_t table[LineDeleteTableSize])
 {
 }
 
@@ -70,12 +73,5 @@ errlHndl_t prdfL3LineDelete(TARGETING::TargetHandle_t i_pl3targetHandle, uint32_
   return NULL;
 }
 
-//-------------------------------------------------------------------------------------------------
+} // end namespace PRDF
 
-// Change Log *************************************************************************************
-//
-//  Flag Reason  Vers    Date     Coder    Description
-//  ---- ------ ------- -------- -------- -------------------------------------------------------
-//       485074 fips310 12/14/04 dgilbert Initial Creation
-//
-// End Change Log *********************************************************************************
diff --git a/src/usr/diag/prdf/common/plat/prdfL3Table.H b/src/usr/diag/prdf/common/plat/prdfL3Table.H
index 6414f82b5..4fbf0fe2a 100755
--- a/src/usr/diag/prdf/common/plat/prdfL3Table.H
+++ b/src/usr/diag/prdf/common/plat/prdfL3Table.H
@@ -37,6 +37,9 @@
 #include <targeting/common/target.H>
 #include <errlentry.H>
 
+namespace PRDF
+{
+
 //--------------------------------------------------------------------
 //  Forward References
 //--------------------------------------------------------------------
@@ -60,7 +63,7 @@ enum l3TableEnum
   <br><b>Notes:       </b>
   </ul><br>
 */
-extern int32_t prdfL3TableAdd(TARGETING::TargetHandle_t i_pl3targetHandle, uint32_t address);
+extern int32_t L3TableAdd(TARGETING::TargetHandle_t i_pl3targetHandle, uint32_t address);
 
  /**
   Copies the line delete table to memory address passed in
@@ -73,7 +76,7 @@ extern int32_t prdfL3TableAdd(TARGETING::TargetHandle_t i_pl3targetHandle, uint3
   <br><b>Notes:       </b>
   </ul><br>
 */
-extern void prdfL3TableGet(TARGETING::TargetHandle_t i_pl3targetHandle, uint32_t table[LineDeleteTableSize]);
+extern void L3TableGet(TARGETING::TargetHandle_t i_pl3targetHandle, uint32_t table[LineDeleteTableSize]);
 
  /**
   Get the count of line deletes in the table
@@ -101,13 +104,7 @@ extern int32_t prdfL3TableCount(TARGETING::TargetHandle_t i_pl3targetHandle);
 */
 extern errlHndl_t prdfL3LineDelete(TARGETING::TargetHandle_t i_pl3targetHandle, uint32_t address);
 
+} // end namespace PRDF
 
 #endif /* PRDFL3TABLE_H */
 
-// Change Log *****************************************************************
-//
-//  Flag Reason Vers     Date     Coder    Description
-//  ---- ------ -------- -------- -------- ------------------------------------
-//       485074 fips310  12/14/04 dgilbert Initial Creation from prdfGrL3Table.H
-//
-// End Change Log *************************************************************
diff --git a/src/usr/diag/prdf/common/plat/prdfLineDelete.C b/src/usr/diag/prdf/common/plat/prdfLineDelete.C
index a3f669918..8b23e1425 100755
--- a/src/usr/diag/prdf/common/plat/prdfLineDelete.C
+++ b/src/usr/diag/prdf/common/plat/prdfLineDelete.C
@@ -31,8 +31,11 @@
 #include <iipServiceDataCollector.h>
 #include <prdfBitString.H>
 
+namespace PRDF
+{
+
 // See prdfLineDelete.H for full function documentation.
-namespace PrdfLineDelete
+namespace LineDelete
 {
 
     /* PrdfCacheCETable::addAddress
@@ -42,7 +45,7 @@ namespace PrdfLineDelete
                                        STEP_CODE_DATA_STRUCT & i_sdc )
     {
         // Get the time of the current error.
-        PrdTimer timeOfError = i_sdc.service_data->GetTOE();
+        Timer timeOfError = i_sdc.service_data->GetTOE();
 
         // Check if time interval has elapsed. If so, flush the table.
         if ( (timeOfError > cv_flushTimer) || !cv_flushTimerInited )
@@ -233,17 +236,5 @@ namespace PrdfLineDelete
     }
 };
 
+} // end namespace PRDF
 
-
-// Change Log ******************************************************************
-//
-// Flag Reason  Vers Date     Coder    Description
-// ---- ------- ---- -------- -------- -----------------------------------------
-//      F522128 f300 09/22/05 iawillia Initial File Creation
-// zs01 F565934 f310 09/06/06 zshelle  Adding getTotalCount()
-// zs02 d573288 f310 10/05/06 zshelle  Adding addToCaptureData()
-// zs03 588751  f310 03/12/07 zshelle  Adding getLargestEntry()
-// zs04 633659  f340 04/11/08 zshelle  Add getEntryCount() and getTableSize()
-// mp26 F750906 f720          plute    Add getCRCAnalysisEntries
-//
-// End Change Log **************************************************************
diff --git a/src/usr/diag/prdf/common/plat/prdfLineDelete.H b/src/usr/diag/prdf/common/plat/prdfLineDelete.H
index 8c7d3c80c..1e3f500db 100755
--- a/src/usr/diag/prdf/common/plat/prdfLineDelete.H
+++ b/src/usr/diag/prdf/common/plat/prdfLineDelete.H
@@ -34,16 +34,19 @@
 #include <iipstep.h>
 #include <iipCaptureData.h>
 
-/** @namespace PrdfLineDelete
+namespace PRDF
+{
+
+/** @namespace LineDelete
  *  Namespace to encapsulate all of the LineDelete specific classes and enums.
  */
-namespace PrdfLineDelete
+namespace LineDelete
 {
 
-    /** @enum PrdfCacheType
+    /** @enum CacheType
      *  Used to express where a cache error occured.
      */
-    enum PrdfCacheType
+    enum CacheType
     {
         L3 = 0,
         L3_DIR = 1,
@@ -56,10 +59,10 @@ namespace PrdfLineDelete
         SLICE_MASK = SLICE_A | SLICE_B
     };
 
-    /** @enum PrdfCacheErrorType
+    /** @enum CacheErrorType
      *  Used to express the types of cache errors that can occur.
      */
-    enum PrdfCacheErrorType
+    enum CacheErrorType
     {
         UE, CE
     };
@@ -168,24 +171,15 @@ namespace PrdfLineDelete
 
         const ThresholdResolution::ThresholdPolicy  iv_thPolicy;
         PrdfCacheAddressTable cv_ceTable;
-        PrdTimer cv_flushTimer;
+        Timer cv_flushTimer;
         bool cv_flushTimerInited;
         uint32_t cv_total;        //zs01
 
     };
 
 };
+
+} // end namespace PRDF
+
 #endif
 
-// Change Log *********************************************************
-//
-//  Flag Reason   Vers Date     Coder    Description
-//  ---- -------- ---- -------- -------- -------------------------------
-//       F522128  f300 09/22/05 iawillia Initial File Creation
-//  zs01 F565934  f310 09/06/06 zshelle         Adding getTotalCount()
-//  zs02 d573288  f310 10/05/06 zshelle         Adding addToCaptureData()
-//  zs03 588751   f310 03/12/07 zshelle  Adding getLargestEntry()
-//  zs04 633659   f340 04/11/08 zshelle  Add getEntryCount() and getTableSize()
-//  mp26 F750906  f720          plute    Add getCRCAnalysisEntries
-//
-// End Change Log *****************************************************
diff --git a/src/usr/diag/prdf/common/plat/prdfMemoryMru.H b/src/usr/diag/prdf/common/plat/prdfMemoryMru.H
index c501e0939..0ab0e4e5e 100755
--- a/src/usr/diag/prdf/common/plat/prdfMemoryMru.H
+++ b/src/usr/diag/prdf/common/plat/prdfMemoryMru.H
@@ -33,6 +33,9 @@
     #include <targeting/common/target.H>
 #endif
 
+// FIXME: RTC 47288 Will need to wrap this in PRDF namespace once external
+//        interfaces are removed/modified.
+
 class PrdfMemoryMru
 {
   public:
diff --git a/src/usr/diag/prdf/common/plat/prdfTOD.H b/src/usr/diag/prdf/common/plat/prdfTOD.H
index de1875d5b..4ae2c4408 100755
--- a/src/usr/diag/prdf/common/plat/prdfTOD.H
+++ b/src/usr/diag/prdf/common/plat/prdfTOD.H
@@ -24,6 +24,8 @@
 #ifndef PRDFTOD_H
 #define PRDFTOD_H
 
+namespace PRDF
+{
 
 /** @struct PrdfTodFaultData
  *  TOD Fault isolation information from a chip.
@@ -37,21 +39,14 @@ struct PrdfTodFaultData
     TARGETING::TargetHandle_t topo_fault_chip[2];
 };
 
-int32_t prdfTorrent_TodCaptureRegisters(STEP_CODE_DATA_STRUCT & i_stepcode);
-int32_t prdfTorrent_TodCleanUpErrors(STEP_CODE_DATA_STRUCT & i_stepcode);
-int32_t prdfTorrent_TodCollectFaultDataSys(vector<PrdfTodFaultData> & o_faults,
-                                      STEP_CODE_DATA_STRUCT & i_stepcode);
-int32_t prdfTorrent_TodCollectFaultDataChip(PrdfExtensibleChip * i_chip,
-                                       vector<PrdfTodFaultData> & o_faults,
-                                       STEP_CODE_DATA_STRUCT & i_stepcode);
-
-
 int32_t prdfP7_TodCaptureRegisters(STEP_CODE_DATA_STRUCT & i_stepcode);
 int32_t prdfP7_TodCleanUpErrors(STEP_CODE_DATA_STRUCT & i_stepcode);
 int32_t prdfP7_TodCollectFaultDataSys(vector<PrdfTodFaultData> & o_faults,
                                       STEP_CODE_DATA_STRUCT & i_stepcode);
-int32_t prdfP7_TodCollectFaultDataChip(PrdfExtensibleChip * i_chip,
+int32_t prdfP7_TodCollectFaultDataChip(ExtensibleChip * i_chip,
                                        vector<PrdfTodFaultData> & o_faults,
                                        STEP_CODE_DATA_STRUCT & i_stepcode);
 
+} // end namespace PRDF
+
 #endif //PRDFTOD_H