PRD: Cleanup GetAttentionType() and GetCauseAttentionType() function names

Change-Id: I2c361b8ca7f0093263ff52bea60741567fa4e63f
RTC: 127050
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/18535
Tested-by: Jenkins Server
Reviewed-by: Brian J. Stegmiller <bjs@us.ibm.com>
Reviewed-by: BENJAMIN J. WEISENBECK <bweisenb@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Reviewed-by: Zane Shelley <zshelle@us.ibm.com>
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/18935
Tested-by: Jenkins OP Build CI
Tested-by: Jenkins OP HW
Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com>

19 files changed, 59 insertions, 54 deletions

diff --git a/src/usr/diag/prdf/common/framework/config/iipSystem.C b/src/usr/diag/prdf/common/framework/config/iipSystem.C
index 2e88ced6b..b57955c1d 100755
--- a/src/usr/diag/prdf/common/framework/config/iipSystem.C
+++ b/src/usr/diag/prdf/common/framework/config/iipSystem.C
@@ -294,7 +294,7 @@ int32_t System::Analyze(STEP_CODE_DATA_STRUCT & serviceData,
                 domainAtAttentionPtr = ((*domainIterator)->Query(atnType)) ? (*domainIterator) : NULL;
                 if(domainAtAttentionPtr != NULL)
                 {
-                    serviceData.service_data->SetCauseAttentionType(atnType);
+                    serviceData.service_data->setSecondaryAttnType(atnType);
                     rc = domainAtAttentionPtr->Analyze(serviceData, atnType);
                     if((rc == PRD_SCAN_COMM_REGISTER_ZERO) ||
                         (rc == PRD_POWER_FAULT) )
diff --git a/src/usr/diag/prdf/common/framework/register/prdfErrorRegister.C b/src/usr/diag/prdf/common/framework/register/prdfErrorRegister.C
index be4e8195e..9ee1358eb 100755
--- a/src/usr/diag/prdf/common/framework/register/prdfErrorRegister.C
+++ b/src/usr/diag/prdf/common/framework/register/prdfErrorRegister.C
@@ -144,7 +144,7 @@ int32_t ErrorRegister::Analyze( STEP_CODE_DATA_STRUCT & io_sdc )
 
     // Get Data from hardware
     const BIT_STRING_CLASS &bs =
-                Read( io_sdc.service_data->GetCauseAttentionType() );
+                Read( io_sdc.service_data->getSecondaryAttnType() );
     BitKey bl;     // null bit list has length 0
 
     if ( scr_rc == SUCCESS )
diff --git a/src/usr/diag/prdf/common/framework/register/prdfResetErrorRegister.C b/src/usr/diag/prdf/common/framework/register/prdfResetErrorRegister.C
index 4a3cdc644..24064490a 100755
--- a/src/usr/diag/prdf/common/framework/register/prdfResetErrorRegister.C
+++ b/src/usr/diag/prdf/common/framework/register/prdfResetErrorRegister.C
@@ -5,7 +5,9 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 1996,2014              */
+/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
+/* [+] 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.       */
@@ -107,9 +109,9 @@ ResetAndMaskErrorRegister::Reset(const BitKey & bit_list,
 {
     int32_t rc = SUCCESS;
     // Don't do reset on CS.
-    if ((CHECK_STOP != error.service_data->GetAttentionType()) && //@pw01
-        (UNIT_CS != error.service_data->GetAttentionType()) &&
-        (UNIT_CS != error.service_data->GetCauseAttentionType()))
+    if ((CHECK_STOP != error.service_data->getPrimaryAttnType()) && //@pw01
+        (UNIT_CS != error.service_data->getPrimaryAttnType()) &&
+        (UNIT_CS != error.service_data->getSecondaryAttnType()))
     {
       #ifndef __HOSTBOOT_MODULE
       ServiceDataCollector & sdc = *(error.service_data);
diff --git a/src/usr/diag/prdf/common/framework/resolution/iipResolution.C b/src/usr/diag/prdf/common/framework/resolution/iipResolution.C
index bde13c9d2..a8bfa68a4 100755
--- a/src/usr/diag/prdf/common/framework/resolution/iipResolution.C
+++ b/src/usr/diag/prdf/common/framework/resolution/iipResolution.C
@@ -186,7 +186,7 @@ int32_t AnalyzeChipResolution::Resolve( STEP_CODE_DATA_STRUCT & io_serviceData )
 {
     // mk442956 a
     return xChip.Analyze( io_serviceData,
-                          io_serviceData.service_data->GetCauseAttentionType() );
+                          io_serviceData.service_data->getSecondaryAttnType() );
 }
 
 // ********************************************************************
@@ -312,7 +312,7 @@ int32_t AnalyzeConnected::Resolve( STEP_CODE_DATA_STRUCT & io_serviceData )
     // Analyze chip.
     if ( NULL != connChip )
         return connChip->Analyze( io_serviceData,
-                        io_serviceData.service_data->GetCauseAttentionType() );
+                        io_serviceData.service_data->getSecondaryAttnType() );
     else
         return PRD_UNRESOLVED_CHIP_CONNECTION;
 }
diff --git a/src/usr/diag/prdf/common/framework/rule/prdfRuleChip.C b/src/usr/diag/prdf/common/framework/rule/prdfRuleChip.C
index 2d53140cc..21825b065 100755
--- a/src/usr/diag/prdf/common/framework/rule/prdfRuleChip.C
+++ b/src/usr/diag/prdf/common/framework/rule/prdfRuleChip.C
@@ -5,7 +5,9 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2004,2014              */
+/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
+/* [+] 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.       */
@@ -105,7 +107,7 @@ int32_t RuleChip::Analyze( STEP_CODE_DATA_STRUCT & i_serviceData,
 
     // Set current ATTN type to input value.
     // If we don't do this, then the AttnRegisters don't work.
-    i_sdc.SetCauseAttentionType(i_attnType);
+    i_sdc.setSecondaryAttnType(i_attnType);
     // Set Signature Chip Id.
     l_errSig.setChipId( GetId() );
     l_rc = iv_pRuleData->Analyze( i_serviceData, i_attnType );
diff --git a/src/usr/diag/prdf/common/framework/rule/prdfRuleMetaData.C b/src/usr/diag/prdf/common/framework/rule/prdfRuleMetaData.C
index 362604daa..5b69db665 100644
--- a/src/usr/diag/prdf/common/framework/rule/prdfRuleMetaData.C
+++ b/src/usr/diag/prdf/common/framework/rule/prdfRuleMetaData.C
@@ -451,7 +451,7 @@ int32_t RuleMetaData::Analyze( STEP_CODE_DATA_STRUCT & i_serviceData,
        l_rc = PRD_SCAN_COMM_REGISTER_ZERO;    //@jl07
 
     // Don't do reset or mask on CS. @pw03
-    if (CHECK_STOP != i_serviceData.service_data->GetAttentionType()) //@pw04
+    if (CHECK_STOP != i_serviceData.service_data->getPrimaryAttnType()) //@pw04
     {
         #ifndef __HOSTBOOT_MODULE
         SyncAnalysis (i_sdc);  //mp01 Add call to Sync SDC
diff --git a/src/usr/diag/prdf/common/framework/service/iipServiceDataCollector.h b/src/usr/diag/prdf/common/framework/service/iipServiceDataCollector.h
index 2065389f9..b737a7279 100755
--- a/src/usr/diag/prdf/common/framework/service/iipServiceDataCollector.h
+++ b/src/usr/diag/prdf/common/framework/service/iipServiceDataCollector.h
@@ -336,12 +336,12 @@ public:
    <br><b>Parameters:  </b> attention type.
    <br><b>Returns:     </b> None.
    <br><b>Requirements:</b> None.
-   <br><b>Promises:    </b> GetAttentionType() == attention,
+   <br><b>Promises:    </b> getPrimaryAttnType() == attention,
                             If(attention == MACHINE_CHECK) IsServiceCall() == true
    <br><b>Exceptions:  </b> None.
    </ul><br>
    */
-  void SetAttentionType(ATTENTION_TYPE attention);
+  void setPrimaryAttnType(ATTENTION_TYPE attention);
 
   /**
    Set the cause attention type
@@ -349,35 +349,35 @@ public:
    <br><b>Parameters:  </b> attention type.
    <br><b>Returns:     </b> None.
    <br><b>Requirements:</b> None.
-   <br><b>Promises:    </b> GetCauseAttentionType() == attention
+   <br><b>Promises:    </b> getSecondaryAttnType() == attention
    <br><b>Exceptions:  </b> None.
    </ul><br>
    */
-  void SetCauseAttentionType(ATTENTION_TYPE attention);  // rc09a
+  void setSecondaryAttnType(ATTENTION_TYPE attention);  // rc09a
 
   /**
    Get the global attention type
    <ul>
    <br><b>Parameters:  </b> None.
    <br><b>Returns:     </b> Attention type [MACHINE_CHECK | RECOVERABLE | SPECIAL]
-   <br><b>Requirements:</b> SetAttentionType()
+   <br><b>Requirements:</b> setPrimaryAttnType()
    <br><b>Promises:    </b> None.
    <br><b>Exceptions:  </b> None.
    </ul><br>
    */
-  ATTENTION_TYPE GetAttentionType(void) const { return attentionType; }
+  ATTENTION_TYPE getPrimaryAttnType(void) const { return attentionType; }
 
   /**
    Get the cause attention type
    <ul>
    <br><b>Parameters:  </b> None.
    <br><b>Returns:     </b> Attention type [MACHINE_CHECK | RECOVERABLE | SPECIAL]
-   <br><b>Requirements:</b> SetCauseAttentionType()
+   <br><b>Requirements:</b> setSecondaryAttnType()
    <br><b>Promises:    </b> None.
    <br><b>Exceptions:  </b> None.
    </ul><br>
    */
-  ATTENTION_TYPE GetCauseAttentionType(void) const { return causeAttentionType; }  // rc09a
+  ATTENTION_TYPE getSecondaryAttnType(void) const { return causeAttentionType; }
 
   /**
    Set the mask id of the error to mask at threshold
@@ -630,7 +630,7 @@ public:
    <ul>
    <br><b>Parameters    </b> None.
    <br><b>Returns:     </b> GardAction::ErrorType
-   <br><b>Requirements:</b> SetAttentionType()
+   <br><b>Requirements:</b> setPrimaryAttnType()
    <br><b>Promises     </b> ErrorType set by Gard or NoGard
    <br><b>Notes:       </b>
    </ul><br>
diff --git a/src/usr/diag/prdf/common/framework/service/iipServiceDataCollector.inl b/src/usr/diag/prdf/common/framework/service/iipServiceDataCollector.inl
index 9b0a292a2..0989d3de9 100755
--- a/src/usr/diag/prdf/common/framework/service/iipServiceDataCollector.inl
+++ b/src/usr/diag/prdf/common/framework/service/iipServiceDataCollector.inl
@@ -52,7 +52,7 @@ ServiceDataCollector::ServiceDataCollector() :
 // ---------------------------------------------------------------
 
 inline
-void ServiceDataCollector::SetAttentionType( ATTENTION_TYPE attention )
+void ServiceDataCollector::setPrimaryAttnType( ATTENTION_TYPE attention )
 {
     attentionType = attention;
     if( MACHINE_CHECK == attention )
@@ -64,7 +64,7 @@ void ServiceDataCollector::SetAttentionType( ATTENTION_TYPE attention )
 // ---------------------------------------------------------------
 
 inline
-void ServiceDataCollector::SetCauseAttentionType(ATTENTION_TYPE attention)
+void ServiceDataCollector::setSecondaryAttnType(ATTENTION_TYPE attention)
 {
   causeAttentionType = attention;
 }
diff --git a/src/usr/diag/prdf/common/framework/service/iipsdbug.h b/src/usr/diag/prdf/common/framework/service/iipsdbug.h
index c9e7ea25f..d574a85d0 100755
--- a/src/usr/diag/prdf/common/framework/service/iipsdbug.h
+++ b/src/usr/diag/prdf/common/framework/service/iipsdbug.h
@@ -175,7 +175,7 @@ public:
    <br><b>Exceptions:  </b> None.
    </ul><br>
    */
-  uint8_t GetAttentionType(TARGETING::TargetHandle_t i_ptargetHandle ) const;
+  uint8_t getPrimaryAttnType(TARGETING::TargetHandle_t i_ptargetHandle ) const;
 
     /**
      * @brief Get the first target of a specified target type with given
@@ -198,7 +198,7 @@ public:
    <br><b>Exceptions:  </b> None.
    </ul><br>
    */
-//  uint8_t GetAttentionType(const CHIP_CLASS & chip) const;
+//  uint8_t getPrimaryAttnType(const CHIP_CLASS & chip) const;
 
   /**
    Get the global(overall) attention type
@@ -287,13 +287,13 @@ public:
    <br><b>Parameters:  </b> i_pTargetHandle, ATTENTION_TYPE
    <br><b>Returns:     </b> None.
    <br><b>Requirements:</b> None.
-   <br><b>Promises:    </b> GetAttentionType() == at
+   <br><b>Promises:    </b> getPrimaryAttnType() == at
    <br><b>Exceptions:  </b> None.
    <br><b>Notes:       </b> Available in PRD simulator only
    </ul><br>
    */
-  void SetAttentionType( TARGETING::TargetHandle_t i_pTargetHandle,
-                         ATTENTION_VALUE_TYPE i_eAttentionType );
+  void setPrimaryAttnType( TARGETING::TargetHandle_t i_pTargetHandle,
+                           ATTENTION_VALUE_TYPE i_eAttentionType );
 
   /**
    * @brief   Adds a chip to the list of chips reporting attention.
diff --git a/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.C b/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.C
index 83f7af4aa..d07b1e54c 100644
--- a/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.C
+++ b/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.C
@@ -197,7 +197,7 @@ errlHndl_t ErrDataService::GenerateSrcPfa( ATTENTION_TYPE i_attnType,
                     // This is a checkstop attention so some values will need
                     // to be overridden.
 
-                    io_sdc.SetAttentionType( origSdc.GetAttentionType() );
+                    io_sdc.setPrimaryAttnType( origSdc.getPrimaryAttnType() );
 
                     if ( origSdc.Terminate() )
                         io_sdc.SetFlag(ServiceDataCollector::TERMINATE);
@@ -222,7 +222,7 @@ errlHndl_t ErrDataService::GenerateSrcPfa( ATTENTION_TYPE i_attnType,
                     // This is a checkstop attention so some values will need
                     // to be overridden.
 
-                    io_sdc.SetAttentionType( origSdc.GetAttentionType() );
+                    io_sdc.setPrimaryAttnType( origSdc.getPrimaryAttnType() );
 
                     if ( origSdc.Terminate() )
                         io_sdc.SetFlag(ServiceDataCollector::TERMINATE);
@@ -424,8 +424,8 @@ errlHndl_t ErrDataService::GenerateSrcPfa( ATTENTION_TYPE i_attnType,
         PRD_Reason_Code = PRDF_DETECTED_FAIL_HARDWARE_PROBABLE;
     }
 
-    SrcWord7  = io_sdc.GetAttentionType() << 8;
-    SrcWord7 |= io_sdc.GetCauseAttentionType();
+    SrcWord7  = io_sdc.getPrimaryAttnType() << 8;
+    SrcWord7 |= io_sdc.getSecondaryAttnType();
 
     //--------------------------------------------------------------------------
     // Check for IPL Diag Mode and set up for Deferred Deconfig
@@ -805,7 +805,7 @@ void ErrDataService::initPfaData( const ServiceDataCollector & i_sdc,
 
     // Attention types
     o_pfa.priAttnType = i_attnType;
-    o_pfa.secAttnType = i_sdc.GetCauseAttentionType();
+    o_pfa.secAttnType = i_sdc.getSecondaryAttnType();
 
     // Build the MRU list into PFA data.
     const SDC_MRU_LIST & mruList = i_sdc.getMruList();
diff --git a/src/usr/diag/prdf/common/framework/service/xspprdsdbug.C b/src/usr/diag/prdf/common/framework/service/xspprdsdbug.C
index 73909bb36..9441a44b1 100755
--- a/src/usr/diag/prdf/common/framework/service/xspprdsdbug.C
+++ b/src/usr/diag/prdf/common/framework/service/xspprdsdbug.C
@@ -271,7 +271,7 @@ TargetHandle_t SYSTEM_DEBUG_CLASS::getTargetWithAttn
 
 // -------------------------------------------------------------------
 
-uint8_t SYSTEM_DEBUG_CLASS::GetAttentionType( TargetHandle_t i_chipTgt ) const
+uint8_t SYSTEM_DEBUG_CLASS::getPrimaryAttnType( TargetHandle_t i_chipTgt ) const
 {
     uint8_t type = INVALID_ATTENTION_TYPE;
     AttnList::iterator it;
@@ -381,8 +381,9 @@ const uint32_t *SYSTEM_DEBUG_CLASS::GetPrdSrcPointer(void) const
     return g_src;
 }
 
-void SYSTEM_DEBUG_CLASS::SetAttentionType(TARGETING::TargetHandle_t i_pTargetHandle,
-                                          ATTENTION_VALUE_TYPE i_eAttnType)
+void SYSTEM_DEBUG_CLASS::setPrimaryAttnType(TARGETING::TargetHandle_t
+                                            i_pTargetHandle,
+                                            ATTENTION_VALUE_TYPE i_eAttnType)
 {
     if(i_eAttnType  > INVALID_ATTENTION_TYPE)
     {
diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfCenMemUtils.C b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMemUtils.C
index 72519211a..7592067c9 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/prdfCenMemUtils.C
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMemUtils.C
@@ -372,7 +372,7 @@ int32_t checkMcsChannelFail( ExtensibleChip * i_mcsChip,
 
         // Set unit checkstop flag and cause attention type.
         io_sc.service_data->SetFlag(ServiceDataCollector::UNIT_CS);
-        io_sc.service_data->SetCauseAttentionType(UNIT_CS);
+        io_sc.service_data->setSecondaryAttnType(UNIT_CS);
         io_sc.service_data->SetThresholdMaskId(0);
 
         // Indicate that cleanup is required.
@@ -417,7 +417,7 @@ int32_t chnlCsCleanup( ExtensibleChip *i_mbChip,
         }
 
         if (( ! i_sc.service_data->IsUnitCS() ) ||
-              (CHECK_STOP == i_sc.service_data->GetAttentionType()) )
+              (CHECK_STOP == i_sc.service_data->getPrimaryAttnType()) )
             break;
 
         CenMembufDataBundle * mbdb = getMembufDataBundle( i_mbChip );
diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfCenMembuf.C b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMembuf.C
index b0888a826..5a51c225d 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/prdfCenMembuf.C
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMembuf.C
@@ -142,7 +142,7 @@ int32_t MBA1_Starvation( ExtensibleChip * i_membChip,
             // Get the mem chiplet register
             SCAN_COMM_REGISTER_CLASS * l_memcFir = NULL;
             uint32_t l_checkBits = 0;
-            switch ( i_sc.service_data->GetCauseAttentionType() )
+            switch ( i_sc.service_data->getSecondaryAttnType() )
             {
                 case CHECK_STOP:
                     l_memcFir = i_membChip->getRegister("MEM_CHIPLET_CS_FIR");
@@ -187,7 +187,7 @@ int32_t MBA1_Starvation( ExtensibleChip * i_membChip,
 
             // Analyze MBA1
             return mba1Chip->Analyze( i_sc,
-                                i_sc.service_data->GetCauseAttentionType() );
+                                i_sc.service_data->getSecondaryAttnType() );
         }
         else
         {
@@ -242,7 +242,7 @@ int32_t PreAnalysis( ExtensibleChip * i_mbChip, STEP_CODE_DATA_STRUCT & i_sc,
         // This is a required for a rare scenario when Centaur CS bit comes
         // up after attention has called PRD and PRD was still at start of
         // analysis.
-        if ( SPECIAL == i_sc.service_data->GetAttentionType() )
+        if ( SPECIAL == i_sc.service_data->getPrimaryAttnType() )
             break;
 
         // MCIFIR[31] is not always reliable if the unit CS originated on the
@@ -265,7 +265,7 @@ int32_t PreAnalysis( ExtensibleChip * i_mbChip, STEP_CODE_DATA_STRUCT & i_sc,
         i_sc.service_data->SetThresholdMaskId(0);
 
         // Set the cause attention type
-        i_sc.service_data->SetCauseAttentionType(UNIT_CS);
+        i_sc.service_data->setSecondaryAttnType(UNIT_CS);
 
         // Indicate that cleanup is required.
         mbdb->iv_doChnlFailCleanup = true;
@@ -819,7 +819,7 @@ int32_t AnalyzeFetchUe( ExtensibleChip * i_membChip,
                            MemoryMruData::CALLOUT_RANK );
         i_sc.service_data->SetCallout( memmru );
 
-        if ( CHECK_STOP != i_sc.service_data->GetAttentionType() )
+        if ( CHECK_STOP != i_sc.service_data->getPrimaryAttnType() )
         {
             // Add a TPS request to the TD queue and ban any further TPS
             // requests for this rank.
@@ -1155,7 +1155,7 @@ int32_t handleMcsChnlCs( ExtensibleChip * i_membChip,
         if ( mciFirBits & ~mciFirMaskBits & chnlCsBitsMask )
         {
             l_rc = mcsChip->Analyze( i_sc,
-                        i_sc.service_data->GetCauseAttentionType() );
+                        i_sc.service_data->getSecondaryAttnType() );
 
             if( SUCCESS == l_rc ) break;
         }
diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfCenPll.C b/src/usr/diag/prdf/common/plat/pegasus/prdfCenPll.C
index c8923a5f3..6d2917a15 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/prdfCenPll.C
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfCenPll.C
@@ -112,7 +112,7 @@ int32_t ClearPll( ExtensibleChip * i_chip,
     #define PRDF_FUNC "[Membuf::ClearPll] "
     int32_t rc = SUCCESS;
 
-    if (CHECK_STOP != i_sc.service_data->GetAttentionType())
+    if (CHECK_STOP != i_sc.service_data->getPrimaryAttnType())
     {
         SCAN_COMM_REGISTER_CLASS * TP_LFIR = i_chip->getRegister("TP_LFIR_AND");
         TP_LFIR->setAllBits();
diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfLaneRepair.C b/src/usr/diag/prdf/common/plat/pegasus/prdfLaneRepair.C
index 5eeeef810..f731958ec 100644
--- a/src/usr/diag/prdf/common/plat/pegasus/prdfLaneRepair.C
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfLaneRepair.C
@@ -75,7 +75,7 @@ int32_t handleLaneRepairEvent( ExtensibleChip * i_chip,
     do
     {
         #ifdef __HOSTBOOT_MODULE
-        if ( CHECK_STOP == i_sc.service_data->GetAttentionType() )
+        if ( CHECK_STOP == i_sc.service_data->getPrimaryAttnType() )
         {
             // This would only happen on OpenPOWER machines when we are doing
             // the post IPL analysis. In this case, we do not have the FFDC to
diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfP8Pll.C b/src/usr/diag/prdf/common/plat/pegasus/prdfP8Pll.C
index de3eabb0c..e572dd123 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/prdfP8Pll.C
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfP8Pll.C
@@ -273,7 +273,7 @@ int32_t ClearPll( ExtensibleChip * i_chip,
 
     int32_t rc = SUCCESS;
 
-    if (CHECK_STOP != i_sc.service_data->GetAttentionType())
+    if (CHECK_STOP != i_sc.service_data->getPrimaryAttnType())
     {
         // Clear proc osc error reg bits
         P8DataBundle * procdb = getDataBundle( i_chip );
@@ -349,7 +349,7 @@ int32_t MaskPll( ExtensibleChip * i_chip,
 
     int32_t rc = SUCCESS;
 
-    if (CHECK_STOP != i_sc.service_data->GetAttentionType())
+    if (CHECK_STOP != i_sc.service_data->getPrimaryAttnType())
     {
         int32_t tmpRC = SUCCESS;
 
@@ -585,7 +585,7 @@ int32_t MaskParityErr( ExtensibleChip * i_chip,
 
     int32_t rc = SUCCESS;
 
-    if (CHECK_STOP != i_sc.service_data->GetAttentionType())
+    if (CHECK_STOP != i_sc.service_data->getPrimaryAttnType())
     {
         // fence off proc osc error reg bits
         P8DataBundle * procdb = getDataBundle( i_chip );
@@ -671,7 +671,7 @@ int32_t ClearParityErr( ExtensibleChip * i_chip,
 
     int32_t rc = SUCCESS;
 
-    if (CHECK_STOP != i_sc.service_data->GetAttentionType())
+    if (CHECK_STOP != i_sc.service_data->getPrimaryAttnType())
     {
         // Clear proc osc error reg bits
         P8DataBundle * procdb = getDataBundle( i_chip );
diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfP8PllPcie.C b/src/usr/diag/prdf/common/plat/pegasus/prdfP8PllPcie.C
index 60a122982..f638fb55a 100755
--- a/src/usr/diag/prdf/common/plat/pegasus/prdfP8PllPcie.C
+++ b/src/usr/diag/prdf/common/plat/pegasus/prdfP8PllPcie.C
@@ -224,7 +224,7 @@ int32_t ClearPllIo( ExtensibleChip * i_chip,
 
     int32_t rc = SUCCESS;
 
-    if (CHECK_STOP != i_sc.service_data->GetAttentionType())
+    if (CHECK_STOP != i_sc.service_data->getPrimaryAttnType())
     {
         // Clear pci osc error reg bit
         int32_t tmpRC = SUCCESS;
@@ -318,7 +318,7 @@ int32_t MaskPllIo( ExtensibleChip * i_chip,
 
     do
     {
-        if (CHECK_STOP == i_sc.service_data->GetAttentionType())
+        if (CHECK_STOP == i_sc.service_data->getPrimaryAttnType())
         {
             break;
         }
diff --git a/src/usr/diag/prdf/common/prdfMain_common.C b/src/usr/diag/prdf/common/prdfMain_common.C
index c74e5c94c..6589c1e39 100755
--- a/src/usr/diag/prdf/common/prdfMain_common.C
+++ b/src/usr/diag/prdf/common/prdfMain_common.C
@@ -251,7 +251,7 @@ errlHndl_t main( ATTENTION_VALUE_TYPE i_attentionType,
         // flush Cache so that SCR reads access hardware
         RegDataCache::getCachedRegisters().flush();
 
-        serviceData.SetAttentionType(i_attentionType);
+        serviceData.setPrimaryAttnType(i_attentionType);
 
         // Set the time in which PRD handled the error.
         Timer timeOfError;
diff --git a/src/usr/diag/prdf/common/util/prdfFilters.C b/src/usr/diag/prdf/common/util/prdfFilters.C
index a62205fec..7cc5bef45 100755
--- a/src/usr/diag/prdf/common/util/prdfFilters.C
+++ b/src/usr/diag/prdf/common/util/prdfFilters.C
@@ -196,11 +196,11 @@ bool SecondaryBitsFilter::Apply( BitKey & io_bitList,
 
         // This filter should only be applied if the primary attention type is
         // CHECK_STOP.
-        if ( CHECK_STOP != io_sdc.service_data->GetAttentionType() ) break;
+        if ( CHECK_STOP != io_sdc.service_data->getPrimaryAttnType() ) break;
 
         // This filter should only be applied if the the secondary attention
         // type is RECOVERABLE.
-        if ( RECOVERABLE != io_sdc.service_data->GetCauseAttentionType()) break;
+        if ( RECOVERABLE != io_sdc.service_data->getSecondaryAttnType()) break;
 
         //if there is no secondary bit position to flip or if no bit is set in
         //bit key then let us skip this apply.