PRD: Add scom register capture from secondary analysis to elog

Change-Id: I2203a0bfe1611030cfca5e2d4ebe2c77d710cb08
RTC: 95887
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/9115
Tested-by: Jenkins Server
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Reviewed-by: Bilicon Patil <bilpatil@in.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/9618

1 files changed, 20 insertions, 1 deletions

diff --git a/src/usr/diag/prdf/common/framework/register/prdfCaptureData.C b/src/usr/diag/prdf/common/framework/register/prdfCaptureData.C
index 0431cf87e..67eab58cc 100755
--- a/src/usr/diag/prdf/common/framework/register/prdfCaptureData.C
+++ b/src/usr/diag/prdf/common/framework/register/prdfCaptureData.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2003,2013              */
+/* COPYRIGHT International Business Machines Corp. 2003,2014              */
 /*                                                                        */
 /* p1                                                                     */
 /*                                                                        */
@@ -365,6 +365,25 @@ CaptureData & CaptureData::operator=(const uint8_t *i_flatdata)
 
 // <-- dg08a
 
+void CaptureData::mergeData(CaptureData & i_cd)
+{
+    DataContainerType l_data = *(i_cd.getData());
+
+    // Remove duplicate entries from secondary capture data
+    for (ConstDataIterator i = data.begin(); i != data.end(); i++)
+    {
+        l_data.remove_if(
+            prdfCompareCaptureDataEntry(i->chipHandle,
+                                          i->address) );
+    }
+
+    // Add secondary capture data to primary one
+    data.insert( data.end(),
+                 l_data.begin(),
+                 l_data.end() );
+}
+
+
 // copy ctor for Data class
 CaptureData::Data::Data(const Data & d):
 chipHandle(d.chipHandle), address(d.address),