diff options
Diffstat (limited to 'src/usr')
-rw-r--r-- | src/usr/fapi2/plat_hw_access.C | 16 | ||||
-rw-r--r-- | src/usr/fapi2/test/fapi2HwAccessTest.H | 4 | ||||
-rw-r--r-- | src/usr/fapi2/test/p9_hwtests.C | 6 | ||||
-rw-r--r-- | src/usr/fapi2/test/p9_hwtests.H | 2 | ||||
-rw-r--r-- | src/usr/scan/scandd.C | 4 | ||||
-rw-r--r-- | src/usr/scan/scandd.H | 2 |
6 files changed, 17 insertions, 17 deletions
diff --git a/src/usr/fapi2/plat_hw_access.C b/src/usr/fapi2/plat_hw_access.C index 5626bf4d2..88686c1f7 100644 --- a/src/usr/fapi2/plat_hw_access.C +++ b/src/usr/fapi2/plat_hw_access.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -912,12 +912,12 @@ ReturnCode platModifyRing(const Target<TARGET_TYPE_ALL>& i_target, return l_rc; } -/// @brief passing a 'Put Ring from Image' message to SBE with RingID +/// @brief passing a 'Put Ring from Image' message to SBE with RingId_t ReturnCode platPutRing(const Target<TARGET_TYPE_ALL>& i_target, - const RingID i_ringID, + const RingId_t i_ringID, const RingMode i_ringMode = RING_MODE_HEADER_CHECK) { - FAPI_DBG("Entering: platPutRing() with RingID"); + FAPI_DBG("Entering: platPutRing() with RingId_t"); ReturnCode l_rc = FAPI2_RC_SUCCESS; errlHndl_t l_err = NULL; @@ -925,8 +925,8 @@ ReturnCode platPutRing(const Target<TARGET_TYPE_ALL>& i_target, // trace in common fapi2_hw_access.H bool l_traceit = platIsScanTraceEnabled(); - //convert const ringID to ringID - RingID l_ringID = reinterpret_cast<RingID>(i_ringID); + //convert const RingId_t to RingId_t + RingId_t l_ringID = reinterpret_cast<RingId_t>(i_ringID); // Extract the component pointer TARGETING::Target* l_target = @@ -961,12 +961,12 @@ ReturnCode platPutRing(const Target<TARGET_TYPE_ALL>& i_target, if (l_traceit) { - FAPI_SCAN("TRACE : PUTRING w RingID : %s : %.16llX", + FAPI_SCAN("TRACE : PUTRING w RingId_t : %s : %.16llX", l_targName, static_cast<uint64_t>(l_ringID)); } - FAPI_DBG(EXIT_MRK "platPutRing() with RingID"); + FAPI_DBG(EXIT_MRK "platPutRing() with RingId_t"); return l_rc; } diff --git a/src/usr/fapi2/test/fapi2HwAccessTest.H b/src/usr/fapi2/test/fapi2HwAccessTest.H index 13ad13b04..e486bed2a 100644 --- a/src/usr/fapi2/test/fapi2HwAccessTest.H +++ b/src/usr/fapi2/test/fapi2HwAccessTest.H @@ -174,10 +174,10 @@ void test_fapi2HwAccess() #if 0 //@fixme-RTC:170587 //this test should not be run at runtime numTests++; - FAPI_INVOKE_HWP(l_errl, p9_platPutRingWRingID_pass); + FAPI_INVOKE_HWP(l_errl, p9_platPutRingWRingId_t_pass); if(l_errl) { - TS_FAIL("Error from p9_platPutRingWRingID_pass !!"); + TS_FAIL("Error from p9_platPutRingWRingId_t_pass !!"); numFails++; errlCommit(l_errl,FAPI2_COMP_ID); delete l_errl; // delete unexpected error log so we dont get diff --git a/src/usr/fapi2/test/p9_hwtests.C b/src/usr/fapi2/test/p9_hwtests.C index 1f8a713ec..5676e8632 100644 --- a/src/usr/fapi2/test/p9_hwtests.C +++ b/src/usr/fapi2/test/p9_hwtests.C @@ -296,10 +296,10 @@ fapi2::ReturnCode p9_ringtest_modring_pass( } -fapi2::ReturnCode p9_platPutRingWRingID_pass() +fapi2::ReturnCode p9_platPutRingWRingId_t_pass() { //every test is displayed this way via FAPI_INF - FAPI_INF("Entering p9_platPutRingWRingID_pass ..."); + FAPI_INF("Entering p9_platPutRingWRingId_t_pass ..."); // get the master proc TARGETING::Target * l_procTest; TARGETING::targetService().masterProcChipTargetHandle( l_procTest); @@ -312,7 +312,7 @@ fapi2::ReturnCode p9_platPutRingWRingID_pass() if(l_status!= fapi2::FAPI2_RC_SUCCESS) { - TS_FAIL("p9_platPutRingWRingID_pass>> proc test - failed"); + TS_FAIL("p9_platPutRingWRingId_t_pass>> proc test - failed"); } return l_status; diff --git a/src/usr/fapi2/test/p9_hwtests.H b/src/usr/fapi2/test/p9_hwtests.H index 984c9fce3..23fa9582d 100644 --- a/src/usr/fapi2/test/p9_hwtests.H +++ b/src/usr/fapi2/test/p9_hwtests.H @@ -72,7 +72,7 @@ fapi2::ReturnCode p9_cfamtest_getcfam_pass( fapi2::ReturnCode p9_cfamtest_putcfam_pass( fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target); -fapi2::ReturnCode p9_platPutRingWRingID_pass(); +fapi2::ReturnCode p9_platPutRingWRingId_t_pass(); fapi2::ReturnCode p9_opmodetest_ignorehwerr( fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target, diff --git a/src/usr/scan/scandd.C b/src/usr/scan/scandd.C index 2356321a8..ffc1fabf1 100644 --- a/src/usr/scan/scandd.C +++ b/src/usr/scan/scandd.C @@ -262,7 +262,7 @@ uint8_t getChipletIDForSBE(TARGETING::Target * i_hbTarget) /// @brief Sends Put Ring from Image message to SBE via PSU errlHndl_t sbeScanPerformOp( TARGETING::Target * i_target, - RingID i_ringID, + RingId_t i_ringID, fapi2::RingMode i_ringMode ) { TRACFCOMP( g_trac_scandd, ENTER_MRK "sbeScanPerformOp(targ=%.8X,id=%d,mode=%.8X)", @@ -359,7 +359,7 @@ errlHndl_t scanPerformOp( DeviceFW::OperationType i_opType, { // from devicefw/userif.H // #define DEVICE_SCAN_SBE_ADDRESS( i_ringID, i_ringMode, i_flag ) - RingID i_ringID = static_cast<RingID>(i_arg0); + RingId_t i_ringID = static_cast<RingId_t>(i_arg0); fapi2::RingMode i_ringMode = static_cast<fapi2::RingMode>(i_arg1); l_err = sbeScanPerformOp( i_target, i_ringID, diff --git a/src/usr/scan/scandd.H b/src/usr/scan/scandd.H index 06e634b02..d20c5a12a 100644 --- a/src/usr/scan/scandd.H +++ b/src/usr/scan/scandd.H @@ -65,7 +65,7 @@ errlHndl_t scanPerformOp( DeviceFW::OperationType i_opType, * @return errlHndl_t returns non-zero value if there is error. */ errlHndl_t sbeScanPerformOp( TARGETING::Target * i_target, - RingID i_ringID, + RingId_t i_ringID, fapi2::RingMode i_ringMode ); /** |