diff options
| author | Brian Silver <bsilver@us.ibm.com> | 2016-02-23 14:53:36 -0600 |
|---|---|---|
| committer | Stephen Cprek <smcprek@us.ibm.com> | 2016-02-26 14:54:20 -0600 |
| commit | 871d3226ff359d9ffa02f5e571fb0824cd76de1f (patch) | |
| tree | 9dd428f00112f7e08200df91c422e6731b6cd15d /src/import/hwpf/fapi2 | |
| parent | 4796b1ae5c72f5fbde67f292180753c22525b919 (diff) | |
| download | talos-hostboot-871d3226ff359d9ffa02f5e571fb0824cd76de1f.tar.gz talos-hostboot-871d3226ff359d9ffa02f5e571fb0824cd76de1f.zip | |
Fix ffdc.H pointer, tooling changes
Change-Id: Ia39df60855e93772f3fbdd2a9a5392cf79038862
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/24672
Reviewed-by: Matt K. Light <mklight@us.ibm.com>
Tested-by: Jenkins Server
Reviewed-by: Brian Silver <bsilver@us.ibm.com>
Diffstat (limited to 'src/import/hwpf/fapi2')
| -rw-r--r-- | src/import/hwpf/fapi2/include/ffdc.H | 9 | ||||
| -rw-r--r-- | src/import/hwpf/fapi2/tools/parseErrorInfo.mk | 2 | ||||
| -rwxr-xr-x | src/import/hwpf/fapi2/tools/parseErrorInfo.pl | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/import/hwpf/fapi2/include/ffdc.H b/src/import/hwpf/fapi2/include/ffdc.H index b13d91bd6..684fb6617 100644 --- a/src/import/hwpf/fapi2/include/ffdc.H +++ b/src/import/hwpf/fapi2/include/ffdc.H @@ -70,8 +70,7 @@ class FirstFailureData // problem. /// FirstFailureData(void): - iv_info( nullptr ) -// iv_info( nullptr ), iv_platDataPtr(nullptr) + iv_info( nullptr ), iv_platDataPtr(nullptr) {} /// @@ -179,7 +178,7 @@ class FirstFailureData { iv_info = nullptr; } -#if 0 + /// /// @brief Returns the platform data pointer value to the caller. /// @@ -197,14 +196,14 @@ class FirstFailureData static_cast<R*>(this)->operator=(FAPI2_RC_PLAT_ERR_SEE_DATA); iv_platDataPtr = i_ptr; }; -#endif + private: // Pointer to the error info std::shared_ptr<ErrorInfo> iv_info; // free format data, to be used by the platform -// void* iv_platDataPtr; + void* iv_platDataPtr; }; } diff --git a/src/import/hwpf/fapi2/tools/parseErrorInfo.mk b/src/import/hwpf/fapi2/tools/parseErrorInfo.mk index 4cb2faedd..dbe2e0ef3 100644 --- a/src/import/hwpf/fapi2/tools/parseErrorInfo.mk +++ b/src/import/hwpf/fapi2/tools/parseErrorInfo.mk @@ -32,7 +32,7 @@ TARGETS += collect_reg_ffdc.H TARGETS += set_sbe_error.H define parseErrorInfo_RUN - $(C1) $$< --empty-ffdc-classes --output-dir=$$($(GENERATED)_PATH) $$(filter-out $$<,$$^) + $(C1) $$< --output-dir=$$($(GENERATED)_PATH) $$(filter-out $$<,$$^) endef $(call BUILD_GENERATED) diff --git a/src/import/hwpf/fapi2/tools/parseErrorInfo.pl b/src/import/hwpf/fapi2/tools/parseErrorInfo.pl index c591e3eae..61a626673 100755 --- a/src/import/hwpf/fapi2/tools/parseErrorInfo.pl +++ b/src/import/hwpf/fapi2/tools/parseErrorInfo.pl @@ -1225,7 +1225,7 @@ foreach my $argnum (0 .. $#ARGV) print ECFILE " }\n"; print ECFILE " else\n"; print ECFILE " {\n"; - print ECFILE " // fapi2::createPlatLog(iv_rc, " . + print ECFILE " fapi2::createPlatLog(iv_rc, " . "(i_sev == fapi2::FAPI2_ERRL_SEV_UNDEFINED)". " ? iv_sev : i_sev);\n"; print ECFILE " }\n\n"; |
