From ab4687481a310f4124ff159a04388ddf0f65ec46 Mon Sep 17 00:00:00 2001 From: Dan Crowell Date: Tue, 15 Mar 2016 11:21:11 -0500 Subject: Fix bad NV names after criss-crossed merges A couple of commits merged cleanly independently but now fail to compile Change-Id: I594c3f098abf049fddd89fc2ecdfd5753df77deb Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/22054 Tested-by: Jenkins Server Reviewed-by: Stephen M. Cprek Reviewed-by: Daniel M. Crowell --- src/usr/fapi2/test/fapi2GetParentTest.C | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/usr/fapi2/test/fapi2GetParentTest.C b/src/usr/fapi2/test/fapi2GetParentTest.C index c83f5bac7..6418b8b9a 100644 --- a/src/usr/fapi2/test/fapi2GetParentTest.C +++ b/src/usr/fapi2/test/fapi2GetParentTest.C @@ -138,7 +138,7 @@ errlHndl_t fapi2GetParentTest() Target fapi2_obusTarget( targeting_targets[MY_OBUS]); Target fapi2_nvbusTarget( - targeting_targets[MY_NVBUS]); + targeting_targets[MY_NV]); Target fapi2_ppeTarget( targeting_targets[MY_PPE]); Target fapi2_pervTarget( @@ -750,12 +750,12 @@ errlHndl_t fapi2GetParentTest() TARGETING::get_huid(l_tempTargetingParent)) { uint8_t l_instance = 0; - targeting_targets[MY_NVBUS]-> + targeting_targets[MY_NV]-> tryGetAttr(l_instance); /*@ * @errortype ERRORLOG::ERRL_SEV_UNRECOVERABLE * @moduleid fapi2::MOD_FAPI2_PLAT_GET_PARENT_TEST - * @reasoncode fapi2::RC_NVBUS_NO_PROC_FOUND + * @reasoncode fapi2::RC_NV_NO_PROC_FOUND * @userdata1[0:31] Expected Parent HUID * @userdata1[32:63] Actual Parent HUID * @userdata2[0:31] Instance of NVBUS @@ -765,7 +765,7 @@ errlHndl_t fapi2GetParentTest() */ l_err = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE, fapi2::MOD_FAPI2_PLAT_GET_PARENT_TEST, - fapi2::RC_NVBUS_NO_PROC_FOUND, + fapi2::RC_NV_NO_PROC_FOUND, TWO_UINT32_TO_UINT64( TO_UINT32( TARGETING::get_huid( @@ -954,4 +954,4 @@ errlHndl_t fapi2GetParentTest() -} \ No newline at end of file +} -- cgit v1.2.3