PRD: Addressing FIXME comments in error log parser

Change-Id: I74ede0b5e4e1ebc5acacb0eafb442d1a35c2335d
RTC:51689
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/8984
Tested-by: Jenkins Server
Reviewed-by: BENJAMIN J. WEISENBECK <bweisenb@us.ibm.com>
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>
Backport: release-fips810
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/9756

3 files changed, 3 insertions, 35 deletions

diff --git a/src/usr/diag/prdf/common/framework/rule/prdrCompile.C b/src/usr/diag/prdf/common/framework/rule/prdrCompile.C
index e28d26612..42941fa2c 100755
--- a/src/usr/diag/prdf/common/framework/rule/prdrCompile.C
+++ b/src/usr/diag/prdf/common/framework/rule/prdrCompile.C
@@ -30,19 +30,8 @@
 // It is important to limit what is included here. We don't want to include
 // files that include external components such as the errl or targeting code.
 // Otherwise, we will pull in way too much code just to compile this on file.
-
-#ifdef CONTEXT_x86_nfp
-
-// FIXME: RTC: 51689 will address this issue.
-// Need support for attributeenums.H in x86.nfp.
-#include <../../../export/ppc/fips/include/attributeenums.H>
-
-#else
-
 #include <attributeenums.H> // For TARGETING::TYPE enum
 
-#endif
-
 // define needed to enable x86 rule parser code only
 #define __PRD_RULE_COMPILE
 #include <prdrCommon.H>
diff --git a/src/usr/diag/prdf/common/iipconst.h b/src/usr/diag/prdf/common/iipconst.h
index 6f0fddbd4..1d207ba46 100755
--- a/src/usr/diag/prdf/common/iipconst.h
+++ b/src/usr/diag/prdf/common/iipconst.h
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2002,2013              */
+/* COPYRIGHT International Business Machines Corp. 2002,2014              */
 /*                                                                        */
 /* p1                                                                     */
 /*                                                                        */
@@ -33,12 +33,7 @@
 /*  Includes                                                          */
 /*--------------------------------------------------------------------*/
 #include <prdf_types.h>
-
-// FIXME: RTC: 51689 will address this issue
-// Need these attribute header files in x86.nfp
-#ifndef CONTEXT_x86_nfp
-  #include <targeting/common/attributes.H>
-#endif
+#include <targeting/common/attributes.H>
 
 /*--------------------------------------------------------------------*/
 /*  User Types                                                        */
@@ -52,11 +47,7 @@
 
 namespace PRDF
 {
-    #ifndef CONTEXT_x86_nfp
     typedef TARGETING::ATTR_HUID_type HUID;
-    #else
-    typedef uint32_t HUID;
-    #endif
 
     // FIXME: RTC: 62867 will resolve this
     enum { INVALID_HUID = 0 };
diff --git a/src/usr/diag/prdf/common/plugins/prdfLogParse_common.C b/src/usr/diag/prdf/common/plugins/prdfLogParse_common.C
index 59cb8c2fb..f33eec815 100644
--- a/src/usr/diag/prdf/common/plugins/prdfLogParse_common.C
+++ b/src/usr/diag/prdf/common/plugins/prdfLogParse_common.C
@@ -43,19 +43,8 @@
 
 #include <errlplugins.H>
 #include <errlusrparser.H>
-
-#ifdef CONTEXT_x86_nfp
-
-// FIXME: RTC: 51689 will address this issue.
-// Need support for attributeenums.H in x86.nfp.
-#include "../../../../export/ppc/fips/include/attributeenums.H"
-
-#else
-
 #include <attributeenums.H> // For TARGETING::TYPE enum
 
-#endif
-
 #include <prdfCenLogParse.H>
 #include <prdfGardType.H>
 
@@ -138,8 +127,7 @@ void getTargetInfo( HUID i_chipId, TARGETING::TYPE & o_targetType,
 {
     using namespace TARGETING;
 
-    // FIXME: RTC: 51689 will address this issue.
-    // This is a hack until we can get targeting support in x86.
+    // TODO: RTC 99942. Replace with HWSV API to get the target type
 
     o_targetType = static_cast<TYPE>((i_chipId >> 16) & 0xff);