diff options
author | Brian Silver <bsilver@us.ibm.com> | 2015-04-09 09:51:38 -0500 |
---|---|---|
committer | Derk Rembold <rembold@de.ibm.com> | 2015-09-03 07:24:55 -0500 |
commit | 0f872cb6b2ad5cc40fc92304a60b0758a09a6730 (patch) | |
tree | e6eb46c0a7f91fcfabcba9c22d9e43bf4d880522 /import/hwpf/fapi2/include/error_scope.H | |
parent | bda6ee41bdb09c336716c5b17e731e0ea9d75752 (diff) | |
download | talos-sbe-0f872cb6b2ad5cc40fc92304a60b0758a09a6730.tar.gz talos-sbe-0f872cb6b2ad5cc40fc92304a60b0758a09a6730.zip |
Migrate headers to support platform specializations
Add plat_target.H, fapi2_target.H
Add plat_error_scope.H, fapi2_error_scope.H
Update documentation to reflect platform support
Wrap buffer print() API to remove from platforms
Move target operators to platform specific files
Move target states to target_states.H
Add plat_hw_access, fapi2_hw_access.H
Make op mode and pib error platform specific
Change-Id: If376f656b2b8a8f207332d42494dd3ce099790c6
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/16970
Reviewed-by: Matt K. Light <mklight@us.ibm.com>
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-by: Brian Silver <bsilver@us.ibm.com>
Tested-by: Brian Silver <bsilver@us.ibm.com>
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/20135
Tested-by: Jenkins Server
Reviewed-by: Derk Rembold <rembold@de.ibm.com>
Diffstat (limited to 'import/hwpf/fapi2/include/error_scope.H')
-rw-r--r-- | import/hwpf/fapi2/include/error_scope.H | 74 |
1 files changed, 3 insertions, 71 deletions
diff --git a/import/hwpf/fapi2/include/error_scope.H b/import/hwpf/fapi2/include/error_scope.H index 4c916745..d742dd0e 100644 --- a/import/hwpf/fapi2/include/error_scope.H +++ b/import/hwpf/fapi2/include/error_scope.H @@ -24,82 +24,14 @@ /* IBM_PROLOG_END_TAG */ /** * @file error_scope.H - * @brief definitions which create a scope for automatic error handling + * @brief platform specializations which create a scope for automatic error handling */ #ifndef __FAPI2_ERROR_SCOPE__ #define __FAPI2_ERROR_SCOPE__ -#include <stdint.h> -#include <thread> -#include <stdio.h> -#include <return_code.H> -#include <hwp_ffdc_classes.H> - -/// @cond -#define FAPI_VA_NARGS_IMPL(_1, _2, _3, _4, _5, N, ...) N -#define FAPI_VA_NARGS(...) FAPI_VA_NARGS_IMPL(__VA_ARGS__, 5, 4, 3, 2, 1) - -#define FAPI_TRY_IMPL2(count, ...) FAPI_TRY ## count (__VA_ARGS__) -#define FAPI_TRY_IMPL(count, ...) FAPI_TRY_IMPL2(count, __VA_ARGS__) - -#define FAPI_TRY_NO_TRACE( __operation__ ) \ - if ((fapi2::current_err = (__operation__)) != fapi2::FAPI2_RC_SUCCESS) \ - { \ - goto fapi_try_exit; \ - } - -// Why debug? Because this isn't a mechanism to gather FFDC -// one should be using FAPI_ASSERT. However, it is nice to -// have a conditional trace in the event of a failure in the -// operation, so that's why this is here. -#define FAPI_TRY_TRACE( __operation__, ... ) \ - if ((fapi2::current_err = (__operation__)) != fapi2::FAPI2_RC_SUCCESS) \ - { \ - FAPI_DBG(__VA_ARGS__); \ - goto fapi_try_exit; \ - } - -#define FAPI_TRY1 FAPI_TRY_NO_TRACE -#define FAPI_TRY2 FAPI_TRY_TRACE -#define FAPI_TRY3 FAPI_TRY_TRACE -#define FAPI_TRY4 FAPI_TRY_TRACE -#define FAPI_TRY5 FAPI_TRY_TRACE -/// @endcond - -/// -/// @brief Wrapper to check an operation for an error state -/// and jump to the label cleam_up if there is an error. -/// @param[in] __operation__ an operation which returns a fapi::ReturnCode -/// @param[in] ... vararg format/agruments for trace output (optional) -/// @note This implementation does not support PIB error masks or -/// FSP operational states. -/// @warning The trace information is only going to be seen during -/// debug, it's not an error or informational trace. This is because -/// traces might not be seen in the field. If you want information -/// you will see on a field error, use FAPI_ASSERT. -/// -#ifdef DOXYGEN -#define FAPI_TRY(__operation__, ...) FAPI_TRY_IMPL -#else -#define FAPI_TRY(...) FAPI_TRY_IMPL(FAPI_VA_NARGS(__VA_ARGS__), __VA_ARGS__) -#endif - -/// -/// @brief Assert a conditional is true. -/// If it is not, the FFDC gathering function is called and the -/// trace is output as a FAPI error trace. -/// @param[in] __conditional__ the condition to assert -/// @param[in] __ffdc__ the FFDC gathering function -/// @param[in] ... varargs, as input to FAPI_ERR -/// -#define FAPI_ASSERT( __conditional__, __ffdc__, ... ) \ - if (! (__conditional__)) \ - { \ - (__ffdc__).execute(); \ - FAPI_ERR(__VA_ARGS__); \ - goto fapi_try_exit; \ - } +#include <plat_error_scope.H> +#include <fapi2_error_scope.H> #endif |