PRD: Remove getFapiTarget and getFapiType

Change-Id: I79a08e712ed9bafc54624a28f95a9856486a5ec0
RTC: 144700
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/21611
Tested-by: Jenkins Server
Reviewed-by: Benjamin J. Weisenbeck <bweisenb@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/21928
Tested-by: FSP CI Jenkins
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

2 files changed, 18 insertions, 43 deletions

diff --git a/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.C b/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.C
index 6126e7a49..da8673873 100755
--- a/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.C
+++ b/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.C
@@ -65,42 +65,26 @@ using namespace CEN_SYMBOL;
 namespace PlatServices
 {
 
-//##############################################################################
-//##                     Utility Functions (for this file only)
-//##############################################################################
-
-/* TODO RTC 144700
-fapi::TargetType getFapiType( TARGETING::TargetHandle_t i_target )
-{
-    fapi::TargetType o_type = fapi::TARGET_TYPE_NONE;
-
-    switch ( getTargetType(i_target) )
-    {
-        case TYPE_PROC:   o_type = fapi::TARGET_TYPE_PROC_CHIP;     break;
-        case TYPE_EX:     o_type = fapi::TARGET_TYPE_EX_CHIPLET;    break;
-        case TYPE_ABUS:   o_type = fapi::TARGET_TYPE_ABUS_ENDPOINT; break;
-        case TYPE_XBUS:   o_type = fapi::TARGET_TYPE_XBUS_ENDPOINT; break;
-        case TYPE_MCS:    o_type = fapi::TARGET_TYPE_MCS_CHIPLET;   break;
-        case TYPE_MEMBUF: o_type = fapi::TARGET_TYPE_MEMBUF_CHIP;   break;
-        case TYPE_MBA:    o_type = fapi::TARGET_TYPE_MBA_CHIPLET;   break;
-        case TYPE_DIMM:   o_type = fapi::TARGET_TYPE_DIMM;          break;
-        default: ;
-    }
-
-    return o_type;
-}
+/*
+IMPORTANT - getFapiTarget NO LONGER IN USE
+Because of the new templatized format of fapi Targets with the changes in
+fapi2 we will no longer be able to dynamically convert a TARGETING::Target to
+a fapi2::Target. Fapi TargetTypes must be determined at compile time, as such,
+we will need to use the fapi2::TargetType constants in declarations of fapi
+Targets. For example:
+
+Where we previously would have had:
+    fapi::Target fapiProc = getFapiTarget(i_proc);
+
+We would now need:
+    fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP> fapiProc(i_proc);
+
+If you would like to take a look at the changes to fapi Targets, their class
+definition is located in src/hwsv/server/hwpf2/fapi2/fapi2_target.H
+Note: the fapi2::TargetType enum is declared in
+src/hwsv/server/hwpf2/fapi2/target_types.H for a list of all the TargetTypes
 */
 
-//##############################################################################
-//##                     System Level Utility Functions
-//##############################################################################
-
-/* TODO RTC 144700
-fapi::Target getFapiTarget( TARGETING::TargetHandle_t i_target )
-{
-    return fapi::Target( getFapiType(i_target), i_target );
-}
-*/
 
 //##############################################################################
 //##                       Lane Repair functions
diff --git a/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.H b/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.H
index e62befd6c..b023a8f79 100755
--- a/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.H
+++ b/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.H
@@ -83,15 +83,6 @@ void getCurrentTime( Timer & o_timer );
 void milliSleep( uint32_t i_seconds, uint32_t i_milliseconds );
 
 /**
- * @brief   Convert a Targeting target to FAPI target
- * @param   i_target  Any target
- * @return  Returns the corresponding FAPI target for a given target
- */
-/* TODO RTC 144700
-fapi::Target getFapiTarget( TARGETING::TargetHandle_t i_target );
-*/
-
-/**
  * @brief Check SMGR runtime state
  * @return true if SMGR state is runtime, false in hostboot without checking
  */