fixed compilation errors when ENABLE_CHECKSTOP_ANALYSIS is enabled

Change-Id: Ic77f03ca0b4c221eef37581e6791ab8b4398af74
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41180
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

3 files changed, 6 insertions, 6 deletions

diff --git a/src/usr/diag/HBconfig b/src/usr/diag/HBconfig
index 3bf6f2a98..3c46d6e02 100644
--- a/src/usr/diag/HBconfig
+++ b/src/usr/diag/HBconfig
@@ -4,7 +4,7 @@ config HBRT_PRD
         Enable HBRT PRD.
 
 config ENABLE_CHECKSTOP_ANALYSIS
-    default n
+    default y
     help
         Enable collection of FIR data by OCC for checkstops and
         post-checkstop analysis by PRD on system reboot
diff --git a/src/usr/diag/prdf/framework/prdfFileRegisterAccess.C b/src/usr/diag/prdf/framework/prdfFileRegisterAccess.C
index a7a89b4cf..dfdaabf9c 100755
--- a/src/usr/diag/prdf/framework/prdfFileRegisterAccess.C
+++ b/src/usr/diag/prdf/framework/prdfFileRegisterAccess.C
@@ -33,7 +33,7 @@ using namespace TARGETING;
 namespace PRDF
 {
 
-errlHndl_t FileScomAccessor::Access(
+uint32_t FileScomAccessor::Access(
                             TargetHandle_t i_target,
                             BitString & bs,
                             uint64_t registerId,
@@ -41,7 +41,7 @@ errlHndl_t FileScomAccessor::Access(
 {
     #define PRDF_FUNC "[FileScomAccessor::Access()] "
 
-    errlHndl_t errlH = NULL;
+    uint32_t rc = SUCCESS;
 
     PnorFirDataReader & firData = PnorFirDataReader::getPnorFirDataReader();
     uint64_t data = 0;
@@ -64,7 +64,7 @@ errlHndl_t FileScomAccessor::Access(
             PRDF_ERR(PRDF_FUNC "Wrong Operation:%u", operation);
     }
 
-    return errlH;
+    return rc;
 
     #undef PRDF_FUNC
 }
diff --git a/src/usr/diag/prdf/framework/prdfFileRegisterAccess.H b/src/usr/diag/prdf/framework/prdfFileRegisterAccess.H
index 256d3ac4d..61d255e8a 100755
--- a/src/usr/diag/prdf/framework/prdfFileRegisterAccess.H
+++ b/src/usr/diag/prdf/framework/prdfFileRegisterAccess.H
@@ -65,10 +65,10 @@ class FileScomAccessor : public ScomAccessor
      * @param BitString - holds data read or to write
      * @param register address
      * @param [READ|WRITE]
-     * @returns NULL if success, valid error handle otherwise
+     * @returns SUCCESS or PRD_SCANCOM_FAILURE
      * @pre bs.Length() must be size of register data to read/write
      */
-    virtual errlHndl_t Access(TARGETING::TargetHandle_t i_target,
+    virtual uint32_t Access(TARGETING::TargetHandle_t i_target,
                             BitString & bs,
                             uint64_t registerId,
                             MopRegisterAccess::Operation operation) const;