diff options
| author | aravnair-in <aravindnair@in.ibm.com> | 2017-09-08 05:21:23 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-09-08 16:30:31 -0400 |
| commit | e2a811277dfce629970af3e4d86fb1a2e85176d0 (patch) | |
| tree | 39223687d0178b09ff1477474800d15b0109f2c8 | |
| parent | 513299a5b565b066816fe31b1ba224f8d195ca27 (diff) | |
| download | talos-hostboot-e2a811277dfce629970af3e4d86fb1a2e85176d0.tar.gz talos-hostboot-e2a811277dfce629970af3e4d86fb1a2e85176d0.zip | |
Modify enum to get around compile issues
Change-Id: Id44efd2795e4fabdbe238f743f495291253c0ff1
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/45836
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: JACOB L. HARVEY <jlharvey@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/45844
Reviewed-by: Hostboot Team <hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
3 files changed, 5 insertions, 5 deletions
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/ddr_phy.C b/src/import/chips/p9/procedures/hwp/memory/lib/phy/ddr_phy.C index ca275de9c..05286dcfa 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/ddr_phy.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/ddr_phy.C @@ -1786,7 +1786,7 @@ fapi2::ReturnCode dll_calibration( const fapi2::Target<fapi2::TARGET_TYPE_MCBIST { FAPI_INF("phy control dll/zcal stat 0x%llx, remaining: %d", stat_reg, poll_remaining); l_status = stat_reg; - return mss::pc::get_dll_cal_status(l_status) != mss::INVALID; + return mss::pc::get_dll_cal_status(l_status) != mss::_INVALID_; }); for (const auto& p : l_mca) diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/phy_cntrl.H b/src/import/chips/p9/procedures/hwp/memory/lib/phy/phy_cntrl.H index a4c015415..dc28b12c1 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/phy_cntrl.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/phy_cntrl.H @@ -412,7 +412,7 @@ static mss::states dll_cal_status_helper( const bool l_good, // Full calibration is still going on in at least 1 DLL while all 3 signals are 0. if ((l_good == mss::LOW) && (l_error == mss::LOW) && (l_error_fine == mss::LOW)) { - return mss::INVALID; + return mss::_INVALID_; } // Full calibration was successful in all DLLs if CAL_GOOD = 1 and both CAL_ERROR and CAL_ERROR_FINE are 0. @@ -463,9 +463,9 @@ inline mss::states get_dll_cal_status( fapi2::buffer<uint64_t>& i_data ) FAPI_INF("pc_dll_status: 0x%016llx", i_data); - if( l_dp_status == mss::INVALID || l_adr_status == mss::INVALID ) + if( l_dp_status == mss::_INVALID_ || l_adr_status == mss::_INVALID_ ) { - return mss::INVALID; + return mss::_INVALID_; } if( l_dp_status == mss::NO || l_adr_status == mss::NO ) diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/shared/mss_const.H b/src/import/chips/p9/procedures/hwp/memory/lib/shared/mss_const.H index 9042ef2e0..454892813 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/shared/mss_const.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/shared/mss_const.H @@ -171,7 +171,7 @@ enum states NO = 0, YES_N = 0, NO_N = 1, - INVALID = 0xFF, + _INVALID_ = 0xFF, NO_CHIP_SELECT_ACTIVE = 0xFF, }; |
