PRD:Addressed all FIXME pertaining to dump

Change-Id: I9eb78ca56686bc5e2f9930dff43d0f04be23e2eb
RTC:88391
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/7867
Tested-by: Jenkins Server
Reviewed-by: Christopher T. Phan <cphan@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.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/8334

2 files changed, 10 insertions, 38 deletions

diff --git a/src/usr/diag/prdf/common/framework/service/iipServiceDataCollector.h b/src/usr/diag/prdf/common/framework/service/iipServiceDataCollector.h
index d15548be2..d611e111f 100755
--- a/src/usr/diag/prdf/common/framework/service/iipServiceDataCollector.h
+++ b/src/usr/diag/prdf/common/framework/service/iipServiceDataCollector.h
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 1998,2013              */
+/* COPYRIGHT International Business Machines Corp. 1998,2014              */
 /*                                                                        */
 /* p1                                                                     */
 /*                                                                        */
@@ -50,9 +50,9 @@
 #include <time.h>
 #include <prdfCallouts.H>
 #include <prdfMain.H>
-#if !defined(PRDFTIMER_H) // dg08
-#include <prdfTimer.H>    // dg08
-#endif                    // dg08
+#if !defined(PRDFTIMER_H)
+#include <prdfTimer.H>
+#endif
 #include <xspprdGardResolution.h>     // for ErrorType
 #include <prdfAssert.h>
 #if( !defined(CONTEXT_x86_nfp) && !defined(_NFP) ) //only for ppc context (@54)
@@ -60,10 +60,10 @@
 #include <iipsdbug.h>
 #endif
 
-#ifndef __HOSTBOOT_MODULE
-
+#ifdef __HOSTBOOT_MODULE
+#include <prdfGlobal.H>
+#else
 #include <hdctContent.H>
-
 #endif
 #include <list>
 #include <prdfExtensibleChip.H>
@@ -782,9 +782,7 @@ private:  // functions
 
 private:  // Data
 
-  #ifndef __HOSTBOOT_MODULE
   hwTableContent ivDumpRequestContent;
-  #endif
 
   ErrorSignature     error_signature;
   CaptureData        captureData;
@@ -868,23 +866,13 @@ public:
    <br><b>Exceptions:  </b> None.
    </ul><br>
    */
-#ifdef __HOSTBOOT_MODULE
-  void SetDump(/*FIXME: hwTableContent iDumpRequestContent,*/
-               TARGETING::TargetHandle_t iDumpRequestChipHandle =NULL)
-  {
-    SetFlag(DUMP);
-    /* FIXME: ivDumpRequestContent = iDumpRequestContent;*/
-    ivpDumpRequestChipHandle = iDumpRequestChipHandle;
-  }
-#else
-  void SetDump(hwTableContent iDumpRequestContent,
-               TARGETING::TargetHandle_t iDumpRequestChipHandle =NULL)
+  void SetDump( hwTableContent iDumpRequestContent,
+                TARGETING::TargetHandle_t iDumpRequestChipHandle = NULL )
   {
     SetFlag(DUMP);
     ivDumpRequestContent = iDumpRequestContent;
     ivpDumpRequestChipHandle = iDumpRequestChipHandle;
   }
-#endif
 
   /**
    Has a Dump been requested
@@ -910,25 +898,14 @@ public:
    <br><b>Notes:       </b> If IsDump()==false than dumpRequestType returned is DUMP_NO_DUMP
    </ul><br>
    */
-#ifdef __HOSTBOOT_MODULE
-  void GetDumpRequest(  /*FIXME: hwTableContent & oDumpRequestContent,*/
-                        TARGETING::TargetHandle_t&
-                        opDumpRequestChipHandle) const
-  {
-    /*FIXME: oDumpRequestContent = ivDumpRequestContent;*/
-    opDumpRequestChipHandle = ivpDumpRequestChipHandle;
-  }
-#else
   void GetDumpRequest(  hwTableContent & oDumpRequestContent,
                         TARGETING::TargetHandle_t&
-                        opDumpRequestChipHandle) const
+                        opDumpRequestChipHandle ) const
   {
     oDumpRequestContent = ivDumpRequestContent;
     opDumpRequestChipHandle = ivpDumpRequestChipHandle;
   }
 
-#endif
-
 // --------------------------------------
 // FSP only functions end
 // --------------------------------------
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 9a9308f86..dc8726ed0 100644
--- a/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.C
+++ b/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.C
@@ -1040,14 +1040,9 @@ void ErrDataService::initPfaData( ServiceDataCollector & i_sdc,
     o_pfa.msDumpLabel[0] = 0x4D532020; // Start of MS Dump flags
     o_pfa.msDumpLabel[1] = 0x44554D50; // 'MS  DUMP'
 
-    // FIXME: RTC 51618 Need add DUMP support in Hostboot
-#ifdef  __HOSTBOOT_MODULE
-    i_sdc.GetDumpRequest( o_dumpTrgt );
-#else
     hwTableContent dumpContent;
     i_sdc.GetDumpRequest( dumpContent, o_dumpTrgt );
     o_pfa.msDumpInfo.content = dumpContent;
-#endif
 
     o_pfa.msDumpInfo.id = getHuid(o_dumpTrgt);