diff options
Diffstat (limited to 'src/import/chips/p9/procedures/hwp/memory/lib/utils')
6 files changed, 8 insertions, 88 deletions
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/utils/c_str.C b/src/import/chips/p9/procedures/hwp/memory/lib/utils/c_str.C index 771df1c77..02ea7c1f9 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/utils/c_str.C +++ b/src/import/chips/p9/procedures/hwp/memory/lib/utils/c_str.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -35,7 +35,7 @@ #include <fapi2.H> #include <lib/mss_attribute_accessors.H> -#include <lib/utils/c_str.H> +#include <c_str.H> using fapi2::TARGET_TYPE_MCBIST; using fapi2::TARGET_TYPE_MCA; diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/utils/c_str.H b/src/import/chips/p9/procedures/hwp/memory/lib/utils/c_str.H deleted file mode 100644 index 23c7ce6ee..000000000 --- a/src/import/chips/p9/procedures/hwp/memory/lib/utils/c_str.H +++ /dev/null @@ -1,78 +0,0 @@ -/* IBM_PROLOG_BEGIN_TAG */ -/* This is an automatically generated prolog. */ -/* */ -/* $Source: src/import/chips/p9/procedures/hwp/memory/lib/utils/c_str.H $ */ -/* */ -/* OpenPOWER HostBoot Project */ -/* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ -/* [+] International Business Machines Corp. */ -/* */ -/* */ -/* 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 c_str.H -/// @brief Function to return the C-string name of a thing -/// -// *HWP HWP Owner: Brian Silver <bsilver@us.ibm.com> -// *HWP HWP Backup: Andre Marin <aamarin@us.ibm.com> -// *HWP Team: Memory -// *HWP Level: 2 -// *HWP Consumed by: HB:FSP - -#ifndef _MSS_C_STR_H_ -#define _MSS_C_STR_H_ - -#include <fapi2.H> - -namespace mss -{ - -// Thread local storage for the string we're going to create. -//TODO RTC:153924 Remove the else case when issue is resolved -#ifndef PLAT_NO_THREAD_LOCAL_STORAGE - extern thread_local char c_str_storage[fapi2::MAX_ECMD_STRING_LEN]; -#else - extern char c_str_storage[fapi2::MAX_ECMD_STRING_LEN]; -#endif - -/// -/// @brief non-target c_str general declaration -/// @tparam T - type you want the const char * for -/// @param[in] i_input - input you want the const char * for -/// @return const char * -/// -template< typename T > -const char* c_str( const T& i_input ); - -/// -/// @brief fapi2::Target c_str general declaration -/// @tparam T - fapi2::TargetType you want the name for -/// @param[in] i_target - target you want the name for -/// @return const char * -/// -template< fapi2::TargetType T > -const char* c_str( const fapi2::template Target<T>& i_target ) -{ - fapi2::toString( i_target, c_str_storage, fapi2::MAX_ECMD_STRING_LEN ); - return c_str_storage; -} - -template<> -const char* c_str( const fapi2::template Target<fapi2::TARGET_TYPE_DIMM>& i_target ); - -} -#endif diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/utils/count_dimm.H b/src/import/chips/p9/procedures/hwp/memory/lib/utils/count_dimm.H index 35e145c54..293f1eeac 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/utils/count_dimm.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/utils/count_dimm.H @@ -38,7 +38,7 @@ #include <fapi2.H> #include <lib/utils/find.H> -#include <lib/utils/c_str.H> +#include <c_str.H> namespace mss { diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/utils/find.H b/src/import/chips/p9/procedures/hwp/memory/lib/utils/find.H index bacf6f00d..d5b7a23d1 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/utils/find.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/utils/find.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -37,15 +37,13 @@ #define _MSS_FIND_H #include <fapi2.H> -#include <map> #include <vector> #include <lib/utils/pos.H> -#include <lib/utils/c_str.H> +#include <c_str.H> namespace mss { - /// /// @brief find a set of elements based on a fapi2 target /// @tparam M the target type to be returned diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/utils/mss_pair.H b/src/import/chips/p9/procedures/hwp/memory/lib/utils/mss_pair.H index 305ec3489..0a43ca394 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/utils/mss_pair.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/utils/mss_pair.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -39,7 +39,7 @@ #include <fapi2.H> #include <lib/utils/find.H> -#include <lib/utils/c_str.H> +#include <c_str.H> namespace mss { diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/utils/scom.H b/src/import/chips/p9/procedures/hwp/memory/lib/utils/scom.H index 7cd747dd6..69099eacb 100644 --- a/src/import/chips/p9/procedures/hwp/memory/lib/utils/scom.H +++ b/src/import/chips/p9/procedures/hwp/memory/lib/utils/scom.H @@ -37,7 +37,7 @@ #define _MSS_SCOM_H_ #include <fapi2.H> -#include <lib/utils/c_str.H> +#include <c_str.H> // // Wrapping scom operations: We wrap fapi2::get/putScom for two reasons. The |
