diff options
author | Zane Shelley <zshelle@us.ibm.com> | 2016-11-09 20:27:30 -0600 |
---|---|---|
committer | Zane C. Shelley <zshelle@us.ibm.com> | 2016-12-06 10:00:48 -0500 |
commit | 24e166c3af3a55796f26c8199b5333d13f20c758 (patch) | |
tree | f0fa54518400a97b5719e75dc8ce033726e94223 /src/usr/diag | |
parent | 1613ef4b00c0a8fcf6b171cf51fc8ee61e9f356f (diff) | |
download | talos-hostboot-24e166c3af3a55796f26c8199b5333d13f20c758.tar.gz talos-hostboot-24e166c3af3a55796f26c8199b5333d13f20c758.zip |
PRD: simplified templates in TdCtlr class.
Change-Id: I3e8afd26d244fa6ed8da47725983bffd40e0ae3d
RTC: 157892
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/32507
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com>
Reviewed-by: Benjamin J. Weisenbeck <bweisenb@us.ibm.com>
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/33077
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Diffstat (limited to 'src/usr/diag')
-rw-r--r-- | src/usr/diag/prdf/plat/mem/prdfMemTdCtlr.C | 7 | ||||
-rw-r--r-- | src/usr/diag/prdf/plat/mem/prdfMemTdCtlr.H | 2 | ||||
-rw-r--r-- | src/usr/diag/prdf/plat/mem/prdfMemTdCtlr_ipl.C | 12 | ||||
-rw-r--r-- | src/usr/diag/prdf/plat/mem/prdfMemTdCtlr_rt.C | 22 | ||||
-rw-r--r-- | src/usr/diag/prdf/plat/mem/prdfP9McbistDataBundle.H | 8 |
5 files changed, 23 insertions, 28 deletions
diff --git a/src/usr/diag/prdf/plat/mem/prdfMemTdCtlr.C b/src/usr/diag/prdf/plat/mem/prdfMemTdCtlr.C index 5f7138271..d54fb3a1c 100644 --- a/src/usr/diag/prdf/plat/mem/prdfMemTdCtlr.C +++ b/src/usr/diag/prdf/plat/mem/prdfMemTdCtlr.C @@ -26,7 +26,6 @@ #include <prdfMemTdCtlr.H> #include <prdfMemAddress.H> -#include <prdfP9McbistDataBundle.H> using namespace TARGETING; @@ -38,7 +37,7 @@ using namespace PlatServices; //------------------------------------------------------------------------------ template<> -uint32_t MemTdCtlr<TYPE_MCBIST, McbistDataBundle *>::initStoppedRank() +uint32_t MemTdCtlr<TYPE_MCBIST>::initStoppedRank() { #define PRDF_FUNC "[initStoppedRank] " @@ -85,9 +84,8 @@ uint32_t MemTdCtlr<TYPE_MCBIST, McbistDataBundle *>::initStoppedRank() //------------------------------------------------------------------------------ -/* RTC 136128 template<> -uint32_t MemTdCtlr<TYPE_MBA, MbaDataBundle *>::initStoppedRank() +uint32_t MemTdCtlr<TYPE_MBA>::initStoppedRank() { #define PRDF_FUNC "[initStoppedRank] " @@ -114,7 +112,6 @@ uint32_t MemTdCtlr<TYPE_MBA, MbaDataBundle *>::initStoppedRank() #undef PRDF_FUNC } -*/ //------------------------------------------------------------------------------ diff --git a/src/usr/diag/prdf/plat/mem/prdfMemTdCtlr.H b/src/usr/diag/prdf/plat/mem/prdfMemTdCtlr.H index efc6d4bcd..bd2f66718 100644 --- a/src/usr/diag/prdf/plat/mem/prdfMemTdCtlr.H +++ b/src/usr/diag/prdf/plat/mem/prdfMemTdCtlr.H @@ -44,7 +44,7 @@ namespace PRDF /** * @brief A state machine for memory Targeted Diagnostics (TD). */ -template <TARGETING::TYPE T, typename D> +template <TARGETING::TYPE T> class MemTdCtlr { public: diff --git a/src/usr/diag/prdf/plat/mem/prdfMemTdCtlr_ipl.C b/src/usr/diag/prdf/plat/mem/prdfMemTdCtlr_ipl.C index 3f2c7f09e..da6e22e5a 100644 --- a/src/usr/diag/prdf/plat/mem/prdfMemTdCtlr_ipl.C +++ b/src/usr/diag/prdf/plat/mem/prdfMemTdCtlr_ipl.C @@ -31,7 +31,6 @@ // Platform includes #include <prdfMemScrubUtils.H> -#include <prdfP9McbistDataBundle.H> #include <prdfP9McbistExtraSig.H> using namespace TARGETING; @@ -43,8 +42,8 @@ using namespace PlatServices; //------------------------------------------------------------------------------ -template <TYPE T, typename D> -uint32_t MemTdCtlr<T,D>::handleCmdComplete( STEP_CODE_DATA_STRUCT & io_sc ) +template <TARGETING::TYPE T> +uint32_t MemTdCtlr<T>::handleCmdComplete( STEP_CODE_DATA_STRUCT & io_sc ) { #define PRDF_FUNC "[MemTdCtlr::handleCmdComplete] " @@ -130,8 +129,8 @@ uint32_t MemTdCtlr<T,D>::handleCmdComplete( STEP_CODE_DATA_STRUCT & io_sc ) //------------------------------------------------------------------------------ -template <TYPE T, typename D> -uint32_t MemTdCtlr<T,D>::defaultStep( STEP_CODE_DATA_STRUCT & io_sc ) +template <TARGETING::TYPE T> +uint32_t MemTdCtlr<T>::defaultStep( STEP_CODE_DATA_STRUCT & io_sc ) { #define PRDF_FUNC "[MemTdCtlr::defaultStep] " @@ -189,7 +188,8 @@ uint32_t MemTdCtlr<T,D>::defaultStep( STEP_CODE_DATA_STRUCT & io_sc ) //------------------------------------------------------------------------------ // Avoid linker errors with the template. -template class MemTdCtlr<TYPE_MCBIST, McbistDataBundle *>; +template class MemTdCtlr<TYPE_MCBIST>; +template class MemTdCtlr<TYPE_MBA>; //------------------------------------------------------------------------------ diff --git a/src/usr/diag/prdf/plat/mem/prdfMemTdCtlr_rt.C b/src/usr/diag/prdf/plat/mem/prdfMemTdCtlr_rt.C index 6e592c18a..fee4ce072 100644 --- a/src/usr/diag/prdf/plat/mem/prdfMemTdCtlr_rt.C +++ b/src/usr/diag/prdf/plat/mem/prdfMemTdCtlr_rt.C @@ -33,7 +33,6 @@ // Platform includes #include <prdfPlatServices.H> -#include <prdfP9McbistDataBundle.H> #include <prdfP9McbistExtraSig.H> using namespace TARGETING; @@ -43,8 +42,8 @@ namespace PRDF using namespace PlatServices; -template <TYPE T, typename D> -uint32_t MemTdCtlr<T,D>::handleCmdComplete( STEP_CODE_DATA_STRUCT & io_sc ) +template <TARGETING::TYPE T> +uint32_t MemTdCtlr<T>::handleCmdComplete( STEP_CODE_DATA_STRUCT & io_sc ) { #define PRDF_FUNC "[MemTdCtlr::handleCmdComplete] " @@ -117,9 +116,9 @@ uint32_t MemTdCtlr<T,D>::handleCmdComplete( STEP_CODE_DATA_STRUCT & io_sc ) //------------------------------------------------------------------------------ -template <TYPE T, typename D> -uint32_t MemTdCtlr<T,D>::handleTdEvent( STEP_CODE_DATA_STRUCT & io_sc, - TdEntry * i_entry ) +template <TARGETING::TYPE T> +uint32_t MemTdCtlr<T>::handleTdEvent( STEP_CODE_DATA_STRUCT & io_sc, + TdEntry * i_entry ) { #define PRDF_FUNC "[MemTdCtlr::handleTdEvent] " @@ -169,8 +168,8 @@ uint32_t MemTdCtlr<T,D>::handleTdEvent( STEP_CODE_DATA_STRUCT & io_sc, //------------------------------------------------------------------------------ -template <TYPE T, typename D> -uint32_t MemTdCtlr<T,D>::initialize() +template <TARGETING::TYPE T> +uint32_t MemTdCtlr<T>::initialize() { #define PRDF_FUNC "[MemTdCtlr::initialize] " @@ -195,8 +194,8 @@ uint32_t MemTdCtlr<T,D>::initialize() //------------------------------------------------------------------------------ -template <TYPE T, typename D> -uint32_t MemTdCtlr<T,D>::defaultStep( STEP_CODE_DATA_STRUCT & io_sc ) +template <TARGETING::TYPE T> +uint32_t MemTdCtlr<T>::defaultStep( STEP_CODE_DATA_STRUCT & io_sc ) { #define PRDF_FUNC "[MemTdCtlr::defaultStep] " @@ -226,7 +225,8 @@ uint32_t MemTdCtlr<T,D>::defaultStep( STEP_CODE_DATA_STRUCT & io_sc ) //------------------------------------------------------------------------------ // Avoid linker errors with the template. -template class MemTdCtlr<TYPE_MCBIST, McbistDataBundle *>; +template class MemTdCtlr<TYPE_MCBIST>; +template class MemTdCtlr<TYPE_MBA>; //------------------------------------------------------------------------------ diff --git a/src/usr/diag/prdf/plat/mem/prdfP9McbistDataBundle.H b/src/usr/diag/prdf/plat/mem/prdfP9McbistDataBundle.H index 86daecef8..4a284253a 100644 --- a/src/usr/diag/prdf/plat/mem/prdfP9McbistDataBundle.H +++ b/src/usr/diag/prdf/plat/mem/prdfP9McbistDataBundle.H @@ -64,13 +64,11 @@ class McbistDataBundle : public DataBundle const McbistDataBundle & operator=( const McbistDataBundle & ) = delete; /** @return The Targeted Diagnostics controller. */ - MemTdCtlr<TARGETING::TYPE_MCBIST,McbistDataBundle *> * getTdCtlr() + MemTdCtlr<TARGETING::TYPE_MCBIST> * getTdCtlr() { - using namespace TARGETING; - if ( nullptr == iv_tdCtlr ) { - iv_tdCtlr = new MemTdCtlr<TYPE_MCBIST,McbistDataBundle *>{iv_chip}; + iv_tdCtlr = new MemTdCtlr<TARGETING::TYPE_MCBIST>{iv_chip}; } return iv_tdCtlr; @@ -82,7 +80,7 @@ class McbistDataBundle : public DataBundle ExtensibleChip * const iv_chip; /** The Targeted Diagnostics controller. */ - MemTdCtlr<TARGETING::TYPE_MCBIST,McbistDataBundle *> * iv_tdCtlr = nullptr; + MemTdCtlr<TARGETING::TYPE_MCBIST> * iv_tdCtlr = nullptr; }; /** |