Remove all compile dependencies on old fapi

Change-Id: Ia1633645fe2b294fecd15a8ede67983b86d3549c
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/22283
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

7 files changed, 29 insertions, 25 deletions

diff --git a/src/usr/targeting/attrPlatOverride.C b/src/usr/targeting/attrPlatOverride.C
index 9368c4af1..2b11fbd5e 100644
--- a/src/usr/targeting/attrPlatOverride.C
+++ b/src/usr/targeting/attrPlatOverride.C
@@ -23,7 +23,8 @@
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
 #include <targeting/attrPlatOverride.H>
-#include <hwpf/plat/fapiPlatAttrOverrideSync.H>
+//@TODO RTC:128106
+//#include <hwpf/plat/fapiPlatAttrOverrideSync.H>
 #include <targeting/common/trace.H>
 #include <targeting/common/targreasoncodes.H>
 #include <errl/errlmanager.H>
@@ -37,9 +38,9 @@ errlHndl_t getAttrOverrides(PNOR::SectionInfo_t &i_sectionInfo,
     TRACFCOMP(g_trac_targeting,"attrPlatOverride::getAttrOverrides ENTER");
 
     // Create local permanent override tank and array of tanks
+    errlHndl_t l_err = NULL;
     AttributeTank l_PermTank;
     AttributeTank* l_overTanks[AttributeTank::TANK_LAYER_LAST];
-    errlHndl_t l_err = NULL;
 
     // Local pointer to array containing each tank layer or io_tanks
     AttributeTank* *l_pOverTanks;
@@ -49,8 +50,9 @@ errlHndl_t getAttrOverrides(PNOR::SectionInfo_t &i_sectionInfo,
     if (io_tanks == NULL)
     {
         // All indexes are -1 due to the first enum being TANK_LAYER_NONE,
-        l_overTanks[AttributeTank::TANK_LAYER_FAPI-1] =
-                    &fapi::theAttrOverrideSync().iv_overrideTank;
+        //@TODO RTC:128106
+        //l_overTanks[AttributeTank::TANK_LAYER_FAPI-1] =
+        //            &fapi::theAttrOverrideSync().iv_overrideTank;
         l_overTanks[AttributeTank::TANK_LAYER_TARG-1] =
                     &Target::theTargOverrideAttrTank();
         l_overTanks[AttributeTank::TANK_LAYER_PERM-1] = &l_PermTank;
diff --git a/src/usr/targeting/common/test/testcommontargeting.H b/src/usr/targeting/common/test/testcommontargeting.H
index 6bb22857c..1a61da3ea 100644
--- a/src/usr/targeting/common/test/testcommontargeting.H
+++ b/src/usr/targeting/common/test/testcommontargeting.H
@@ -41,10 +41,6 @@
 #include <sys/time.h>
 
 // CXXTEST
-#include <hwpf/plat/fapiPlatAttributeService.H>
-#include <fapiReturnCode.H>
-#include <fapiAttributeIds.H>
-#include <fapiAttributeService.H>
 #include <targeting/common/error.H>
 
 // This component
@@ -1298,7 +1294,6 @@ class CommonTargetingTestSuite: public CxxTest::TestSuite
         TARG_TS_TRACE(INFO_MRK "Now using direct access macros");
 
         using namespace TARGETING;
-        using namespace fapi;
 
         TargetService& l_targetService = targetService();
 
@@ -1345,6 +1340,9 @@ class CommonTargetingTestSuite: public CxxTest::TestSuite
         TARG_TS_TRACE(INFO_MRK "Now using FAPI get macros");
 
         memset(l_dummyRw,0x00,sizeof(l_dummyRw));
+
+#if 0
+        //@TODO RTC:142602
         fapi::ReturnCode l_rc = FAPI_ATTR_GET(
                                               ATTR_DUMMY_SCRATCH_PLAT_INIT_UINT8, NULL, l_dummyRw);
         if(l_rc != 0)
@@ -1361,6 +1359,7 @@ class CommonTargetingTestSuite: public CxxTest::TestSuite
         TARG_TS_TRACE(INFO_MRK "Now using FAPI set macros");
 
         l_dummyRw[0][2][3] = 6;
+
         l_rc = FAPI_ATTR_SET(ATTR_DUMMY_SCRATCH_PLAT_INIT_UINT8, NULL,
                              l_dummyRw);
         if(l_rc != 0)
@@ -1392,7 +1391,7 @@ class CommonTargetingTestSuite: public CxxTest::TestSuite
         {
             TARG_TS_FAIL("Node 0 target handle should not be NULL");
         }
-
+        //@TODO RTC:142602
         fapi::Target* l_pFapiTarget = new fapi::Target(
                                                        fapi::TARGET_TYPE_PROC_CHIP, l_pTarget);
         l_rc = FAPI_ATTR_GET(ATTR_DUMMY_SCRATCH_PLAT_INIT_UINT8,
@@ -1406,13 +1405,13 @@ class CommonTargetingTestSuite: public CxxTest::TestSuite
         {
             TARG_TS_FAIL("Should have been a platform handled error");
         }
-
         // The error log will get deleted when the ReturnCode is destructed. The
         // error log is not committed here to avoid it getting interpreted as a
         // real problem
 
         delete l_pFapiTarget;
         l_pFapiTarget = NULL;
+#endif
 
         TARG_TS_TRACE(EXIT_MRK "testFapiToHbMacros" );
     }
@@ -1422,7 +1421,6 @@ class CommonTargetingTestSuite: public CxxTest::TestSuite
         TARG_TS_TRACE(ENTER_MRK "testPodNumericalTypes" );
 
         using namespace TARGETING;
-        using namespace fapi;
 
         TargetService& l_targetService = targetService();
 
diff --git a/src/usr/targeting/makefile b/src/usr/targeting/makefile
index eaa6dbb8d..5330b963c 100644
--- a/src/usr/targeting/makefile
+++ b/src/usr/targeting/makefile
@@ -65,7 +65,8 @@ OBJS += ${HOSTBOOT_SPECIFIC_OBJS}
 SUBDIRS += test.d
 SUBDIRS += xmltohb.d
 SUBDIRS += runtime.d
-SUBDIRS += attroverride.d
+#@TODO RTC:128106
+#SUBDIRS += attroverride.d
 
 include ${ROOTPATH}/config.mk
 
diff --git a/src/usr/targeting/runtime/attrPlatOverride_rt.C b/src/usr/targeting/runtime/attrPlatOverride_rt.C
index 98d063fa0..9a5498111 100644
--- a/src/usr/targeting/runtime/attrPlatOverride_rt.C
+++ b/src/usr/targeting/runtime/attrPlatOverride_rt.C
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/usr/targeting/attrPlatOverride.C $                        */
+/* $Source: src/usr/targeting/runtime/attrPlatOverride_rt.C $             */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
@@ -27,7 +27,8 @@
 #include <runtime/rt_targeting.H>
 #include <targeting/common/commontargeting.H>
 #include <targeting/attrPlatOverride.H>
-#include <hwpf/plat/fapiPlatAttrOverrideSync.H>
+//@TODO RTC:132750
+//#include <hwpf/plat/fapiPlatAttrOverrideSync.H>
 #include <targeting/common/trace.H>
 #include <errl/errlmanager.H>
 
@@ -40,6 +41,8 @@ int apply_attr_override(uint8_t* i_data,
                         size_t i_size )
 {
     int rc = 0;
+//@TODO RTC:132750
+#if 0
     errlHndl_t l_errl = NULL;
 
     TRACFCOMP(g_trac_targeting, "enter apply_attr_override");
@@ -83,6 +86,7 @@ int apply_attr_override(uint8_t* i_data,
     {
         TRACFCOMP(g_trac_targeting, "apply_attr_override succeed");
     }
+#endif
     return rc;
 }
 
diff --git a/src/usr/targeting/runtime/makefile b/src/usr/targeting/runtime/makefile
index 1c78cbd98..4dd9806d0 100644
--- a/src/usr/targeting/runtime/makefile
+++ b/src/usr/targeting/runtime/makefile
@@ -26,7 +26,8 @@ HOSTBOOT_RUNTIME = 1
 ROOTPATH = ../../../..
 MODULE = targeting_rt
 
-SUBDIRS += test.d
+#@TODO RTC:132750
+#SUBDIRS += test.d
 
 TARGETING_REL_PATH = ..
 include ${TARGETING_REL_PATH}/hostboot_common.mk
diff --git a/src/usr/targeting/test/makefile b/src/usr/targeting/test/makefile
index ae56feb31..b8d466539 100644
--- a/src/usr/targeting/test/makefile
+++ b/src/usr/targeting/test/makefile
@@ -5,7 +5,9 @@
 #
 # OpenPOWER HostBoot Project
 #
-# COPYRIGHT International Business Machines Corp. 2011,2014
+# Contributors Listed Below - COPYRIGHT 2011,2015
+# [+] International Business Machines Corp.
+#
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/src/usr/targeting/test/testtargeting.H b/src/usr/targeting/test/testtargeting.H
index 695836496..fdd4702da 100644
--- a/src/usr/targeting/test/testtargeting.H
+++ b/src/usr/targeting/test/testtargeting.H
@@ -5,7 +5,9 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012,2014              */
+/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
 /* you may not use this file except in compliance with the License.       */
@@ -40,10 +42,7 @@
 
 // CXXTEST
 #include <cxxtest/TestSuite.H>
-#include <hwpf/plat/fapiPlatAttributeService.H>
-#include <fapiReturnCode.H>
-#include <fapiAttributeIds.H>
-#include <fapiAttributeService.H>
+
 #include <errl/errlmanager.H>
 #include <sys/sync.h>
 #include <sys/task.h>
@@ -103,7 +102,6 @@ class TargetingTestSuite : public CxxTest::TestSuite
         TS_TRACE(ENTER_MRK "testHbMutexAttr" );
 
         using namespace TARGETING;
-        using namespace fapi;
 
         do {
 
@@ -207,7 +205,6 @@ class TargetingTestSuite : public CxxTest::TestSuite
 
         using namespace ERRORLOG;
         using namespace TARGETING;
-        using namespace fapi;
 
         // Get a reference to the target service
         TargetService& l_service = targetService();
@@ -253,7 +250,6 @@ class TargetingTestSuite : public CxxTest::TestSuite
         // is resolved
         using namespace ERRORLOG;
         using namespace TARGETING;
-        using namespace fapi;
 
         TargetHandleList l_targs;