PRD: misc fixes

Change-Id: Id24d4598f6f48369fd6f9a2b35d36cd7ba904a2a
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/46295
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com>
Reviewed-by: Benjamin J. Weisenbeck <bweisenb@us.ibm.com>
Reviewed-by: Brian J. Stegmiller <bjs@us.ibm.com>
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/46806
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>

3 files changed, 6 insertions, 7 deletions

diff --git a/src/usr/diag/prdf/common/plat/prdfRasServices_common.C b/src/usr/diag/prdf/common/plat/prdfRasServices_common.C
index da0fa24a6..c834013b3 100755
--- a/src/usr/diag/prdf/common/plat/prdfRasServices_common.C
+++ b/src/usr/diag/prdf/common/plat/prdfRasServices_common.C
@@ -38,6 +38,8 @@
 #include <prdfMemoryMru.H>
 #include <prdfPlatServices.H>
 
+#include <prdfMemCaptureData.H>
+
 // For compression routines
 #define PRDF_COMPRESSBUFFER_COMPRESS_FUNCTIONS
 #include <prdfCompressBuffer.H>
@@ -611,15 +613,13 @@ errlHndl_t ErrDataService::GenerateSrcPfa( ATTENTION_TYPE i_attnType,
         // Operate only on MemoryMru callouts.
         if ( PRDcalloutData::TYPE_MEMMRU != it->callout.getType() ) continue;
 
-/* TODO RTC 136125
         // Only add single DIMM callouts. Otherwise, the parsed data is
         // redundant.
         MemoryMru memMru ( it->callout.flatten() );
         if ( !memMru.getSymbol().isValid() ) continue;
 
         // Add the MemoryMru to the capture data.
-        CenMbaCaptureData::addExtMemMruData( memMru, iv_errl );
-*/
+        MemCaptureData::addExtMemMruData( memMru, iv_errl );
     }
 
     //**************************************************************************
diff --git a/src/usr/diag/prdf/common/util/prdfBitString.H b/src/usr/diag/prdf/common/util/prdfBitString.H
index 8f77792fe..130d3792c 100755
--- a/src/usr/diag/prdf/common/util/prdfBitString.H
+++ b/src/usr/diag/prdf/common/util/prdfBitString.H
@@ -87,7 +87,7 @@ typedef uint32_t CPU_WORD;
  * sufficient space in the buffer. For example, getNumCpuWords(48) returns 2.
  *
  * The bit positions are ordered 0 to n (left to right), where n is the bit
- * length minus one. Be default, position 0 will be the first bit of the
+ * length minus one. By default, position 0 will be the first bit of the
  * buffer's start address. The optional constructor allows users to input an
  * offset anywhere within the buffer, which is then used as position 0. This is
  * useful when the data within the buffer is a right-justified.
diff --git a/src/usr/diag/prdf/test/prdfTest_ScomAccessInterface.H b/src/usr/diag/prdf/test/prdfTest_ScomAccessInterface.H
index a39a93c23..27d799e9b 100644
--- a/src/usr/diag/prdf/test/prdfTest_ScomAccessInterface.H
+++ b/src/usr/diag/prdf/test/prdfTest_ScomAccessInterface.H
@@ -67,9 +67,8 @@ public:
         //we will be using bit 61 of this address which is a spare bit in the
         //OCC fir, which shouldn't generate an attention
         uint64_t address = 0x01010800;
-        CPU_WORD l_cpuWord[(64)/(sizeof(CPU_WORD)*8)] = {0};
-        BitString exp(64, l_cpuWord);
-        BitString bs(64, l_cpuWord);
+        BitStringBuffer exp(64);
+        BitStringBuffer bs(64);
 
         TARGETING::TargetHandleList targetList =
             PRDF::PlatServices::getFunctionalTargetList(TARGETING::TYPE_PROC);