diff options
| author | Richard J. Knight <rjknight@us.ibm.com> | 2016-08-31 09:10:02 -0500 |
|---|---|---|
| committer | Sachin Gupta <sgupta2m@in.ibm.com> | 2016-09-13 02:20:43 -0400 |
| commit | 618c1dd87d43f3e516dfb0dd50583febec8b95c8 (patch) | |
| tree | c8577da54c8aa14ad1ac6b0ce04e08f1178ad3bf /src | |
| parent | 8ed959b6030f18379e0870feb4b85f8f5295303e (diff) | |
| download | talos-sbe-618c1dd87d43f3e516dfb0dd50583febec8b95c8.tar.gz talos-sbe-618c1dd87d43f3e516dfb0dd50583febec8b95c8.zip | |
Phase in support for platform getTarget for ffdc
-Removed temporary function for getTarget
-Wrapped usage in #ifdef to allow mirrored files
to compile
Change-Id: I1de1da708146427ada3f9cc4e1977dd608172cf4
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/29039
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Reviewed-by: Deepak Kodihalli <dkodihal@in.ibm.com>
Reviewed-by: Matt K. Light <mklight@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/29043
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/import/hwpf/fapi2/include/error_info_defs.H | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/import/hwpf/fapi2/include/error_info_defs.H b/src/import/hwpf/fapi2/include/error_info_defs.H index c67e4061..e40af7f9 100644 --- a/src/import/hwpf/fapi2/include/error_info_defs.H +++ b/src/import/hwpf/fapi2/include/error_info_defs.H @@ -1,7 +1,7 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: import/hwpf/fapi2/include/error_info_defs.H $ */ +/* $Source: src/import/hwpf/fapi2/include/error_info_defs.H $ */ /* */ /* OpenPOWER sbe Project */ /* */ @@ -41,15 +41,6 @@ namespace fapi2 { -// $TEMP - funciton temp function to pass compiling -template<TargetType T> -Target<T>* getTarget(TargetType type, uint8_t instance) -{ - static_cast<void>(type); - static_cast<void>(instance); - return new Target<T>(0); -} - /// /// @brief Type to hold the ffdc data to be sent to hostboot /// @@ -258,7 +249,6 @@ enum CollectTrace MBOX = 4, }; } -#endif // NOTE - this assumes no buffer_t or variable_buffers are passed // data is converted to a uint64_t when placed into the sbe ffdc @@ -272,11 +262,13 @@ inline fapi2::ffdc_t getFfdcData( sbeFfdc_t& i_sbeFfdc ) if(temp.size() == EI_FFDC_SIZE_TARGET) { +#ifdef FAPI2_ENABLE_PLATFORM_GET_TARGET uint64_t targetData = i_sbeFfdc.data; fapi2::TargetType type = static_cast<fapi2::TargetType>(targetData >> 32); uint8_t instance = static_cast<uint8_t>(targetData & 0xFFFFFFFF); // call hostboot to get the fapi2 target reference temp.ptr() = static_cast<void*>(getTarget<TARGET_TYPE_ALL>(type, instance)); +#endif } else { @@ -287,6 +279,7 @@ inline fapi2::ffdc_t getFfdcData( sbeFfdc_t& i_sbeFfdc ) return temp; } +#endif /// /// @brief Get FFDC Size /// |
