PRD: removed obsolete SystemSpecific code

Change-Id: I63fad1bd2bee659e2068b744ffd04e2108d64355
CQ: SW283549
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14190
Tested-by: Jenkins Server
Reviewed-by: Prem Shanker Jha <premjha2@in.ibm.com>
Reviewed-by: Bilicon Patil <bilpatil@in.ibm.com>
Reviewed-by: Christopher T. Phan <cphan@us.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/14265

5 files changed, 3 insertions, 111 deletions

diff --git a/src/usr/diag/prdf/common/framework/config/prdfSystemSpecific.H b/src/usr/diag/prdf/common/framework/config/prdfSystemSpecific.H
deleted file mode 100755
index 0fe190977..000000000
--- a/src/usr/diag/prdf/common/framework/config/prdfSystemSpecific.H
+++ /dev/null
@@ -1,59 +0,0 @@
-/* IBM_PROLOG_BEGIN_TAG                                                   */
-/* This is an automatically generated prolog.                             */
-/*                                                                        */
-/* $Source: src/usr/diag/prdf/common/framework/config/prdfSystemSpecific.H $ */
-/*                                                                        */
-/* OpenPOWER HostBoot Project                                             */
-/*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2008,2014              */
-/*                                                                        */
-/* Licensed under the Apache License, Version 2.0 (the "License");        */
-/* you may not use this file except in compliance with the License.       */
-/* You may obtain a copy of the License at                                */
-/*                                                                        */
-/*     http://www.apache.org/licenses/LICENSE-2.0                         */
-/*                                                                        */
-/* Unless required by applicable law or agreed to in writing, software    */
-/* distributed under the License is distributed on an "AS IS" BASIS,      */
-/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
-/* implied. See the License for the specific language governing           */
-/* permissions and limitations under the License.                         */
-/*                                                                        */
-/* IBM_PROLOG_END_TAG                                                     */
-
-/** @file prdfSystemSpecific.H
- *  @brief Redirection namespace for code specific for product families.
- *
- *  The purpose of this namespace is to add an indirection between prdf_main
- *  and the various family implementations.  This allows us to create a family
- *  specific library to reduce flash requirements when we have to support
- *  multiple families with the same code level.  (P6 and P7 for example).
- *
- *  There is a P6 implementation for eCLipz, P7 implementation for Apollo and
- *  P8 implementation for pegasus
- *  These are in the appropriate rule/<family> directory in P6/P7.
- *  For p8 these are defines in plat/<family> directory.
- *
- *  For shipping code, only one implementation is in the shipped library.  The
- *  eCLipz instance goes in the libprdfh_p6.so, etc.
- *
- */
-
-#ifndef __PRDFSYSTEMSPECIFIC_H
-#define __PRDFSYSTEMSPECIFIC_H
-
-#include <iipConfigurator.h>
-#include <iipstep.h>
-
-namespace PRDF
-{
-
-namespace SystemSpecific
-{
-    Configurator * getConfiguratorPtr();
-    void postAnalysisWorkarounds(STEP_CODE_DATA_STRUCT & i_sdc);
-};
-
-} // end namespace PRDF
-
-#endif
diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfP8SystemSpecific.C b/src/usr/diag/prdf/common/plat/pegasus/prdfP8SystemSpecific.C
deleted file mode 100644
index fa10cf7d6..000000000
--- a/src/usr/diag/prdf/common/plat/pegasus/prdfP8SystemSpecific.C
+++ /dev/null
@@ -1,45 +0,0 @@
-/* IBM_PROLOG_BEGIN_TAG                                                   */
-/* This is an automatically generated prolog.                             */
-/*                                                                        */
-/* $Source: src/usr/diag/prdf/common/plat/pegasus/prdfP8SystemSpecific.C $ */
-/*                                                                        */
-/* OpenPOWER HostBoot Project                                             */
-/*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012,2014              */
-/*                                                                        */
-/* Licensed under the Apache License, Version 2.0 (the "License");        */
-/* you may not use this file except in compliance with the License.       */
-/* You may obtain a copy of the License at                                */
-/*                                                                        */
-/*     http://www.apache.org/licenses/LICENSE-2.0                         */
-/*                                                                        */
-/* Unless required by applicable law or agreed to in writing, software    */
-/* distributed under the License is distributed on an "AS IS" BASIS,      */
-/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
-/* implied. See the License for the specific language governing           */
-/* permissions and limitations under the License.                         */
-/*                                                                        */
-/* IBM_PROLOG_END_TAG                                                     */
-
-#include <prdfSystemSpecific.H>
-#include <prdfGlobal.H>
-#include <prdfPegasusConfigurator.H>
-#include <prdfPlatServices.H>
-
-namespace PRDF
-{
-
-namespace SystemSpecific
-{
-    PRDF::Configurator * getConfiguratorPtr()
-    {
-        return new PRDF::PegasusConfigurator();
-    }
-
-    void postAnalysisWorkarounds(STEP_CODE_DATA_STRUCT & i_sdc)
-    {
-        return;
-    }
-};
-
-} // end namespace PRDF
diff --git a/src/usr/diag/prdf/common/prd_pegasus.mk b/src/usr/diag/prdf/common/prd_pegasus.mk
index 47edde179..817f34c37 100755
--- a/src/usr/diag/prdf/common/prd_pegasus.mk
+++ b/src/usr/diag/prdf/common/prd_pegasus.mk
@@ -38,9 +38,6 @@ PRDF_RULE_PLUGINS_PEGASUS += prdfCenPll.o
 PRDF_RULE_PLUGINS_PEGASUS += prdfPlatP8Proc.o
 PRDF_RULE_PLUGINS_PEGASUS += prdfPlatCenMemUtils.o
 
-# Object files for PRDF rule plugins, but include sim extensions.
-PRDF_RULE_PLUGINS_PEGASUS_WSIM += prdfP8SystemSpecific.o
-
 # PEGASUS specific objects, not rule related.
 prd_pegasus_specific += prdfCalloutUtil.o
 prd_pegasus_specific += prdfPhbUtils.o
diff --git a/src/usr/diag/prdf/common/prdfMain_common.C b/src/usr/diag/prdf/common/prdfMain_common.C
index 8d27e53c8..a765316db 100755
--- a/src/usr/diag/prdf/common/prdfMain_common.C
+++ b/src/usr/diag/prdf/common/prdfMain_common.C
@@ -43,9 +43,10 @@
 #include <prdfRasServices.H>
 #include <prdfRegisterCache.H>
 #include <prdfScanFacility.H>
-#include <prdfSystemSpecific.H>
 #include <prdfMfgThresholdMgr.H>
 
+#include <prdfPegasusConfigurator.H>
+
 namespace PRDF
 {
 
@@ -116,7 +117,7 @@ errlHndl_t noLock_initialize()
         initPlatSpecific();
 
         CcAutoDeletePointer<Configurator> configuratorPtr
-            (SystemSpecific::getConfiguratorPtr());
+                                          ( new PRDF::PegasusConfigurator() );
 
         errlHndl_t l_errBuild = configuratorPtr->build();//build object model
         if( NULL != l_errBuild )
@@ -259,7 +260,6 @@ errlHndl_t main( ATTENTION_VALUE_TYPE i_attentionType,
         //delete all the wrapper register objects since these were created
         //just for plugin code
         l_scanFac.ResetPluginRegister();
-        SystemSpecific::postAnalysisWorkarounds(sdc);
         if(analyzeRc != SUCCESS && g_prd_errlHndl == NULL)
         {
             // We have a bad RC, but no error log - Fill out SDC and have
diff --git a/src/usr/diag/prdf/makefile b/src/usr/diag/prdf/makefile
index 61750a1da..57e492cdc 100755
--- a/src/usr/diag/prdf/makefile
+++ b/src/usr/diag/prdf/makefile
@@ -110,7 +110,6 @@ OBJS += ${prd_pegasus_specific}
 OBJS += ${prd_object_files_HB}
 OBJS += ${PRDF_RULE_PLUGINS_PEGASUS}
 OBJS += ${PRDF_RULE_PLUGINS_PEGASUS_HB}
-OBJS += ${PRDF_RULE_PLUGINS_PEGASUS_WSIM}
 
 #------------------------------------------------------------------------------
 # Generated Mfg Threshold Header file