FAPI2 - Error/FFDC work related updates

Change-Id: I2c153d4362791d885b85fee0f4891a9239c6aec7
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/19308
Tested-by: Jenkins Server
Reviewed-by: Matt K. Light <mklight@us.ibm.com>
Reviewed-by: Richard J. Knight <rjknight@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>

2 files changed, 17 insertions, 18 deletions

diff --git a/import/hwpf/fapi2/include/buffer.H b/import/hwpf/fapi2/include/buffer.H
index b7bd96c2..deabcda4 100644
--- a/import/hwpf/fapi2/include/buffer.H
+++ b/import/hwpf/fapi2/include/buffer.H
@@ -32,7 +32,7 @@
 
 #include <buffer_parameters.H>
 #include <buffer_traits.H>
-#include <return_code.H>
+#include <return_code_defs.H>
 
 namespace fapi2
 {
@@ -114,7 +114,7 @@ class buffer
         ///    variable_buffer into a variable_buffer, use insert()
         ///
         template< typename OT>
-        inline fapi2::ReturnCode set(OT i_value, const bits_type i_offset = 0)
+        inline fapi2::ReturnCodes set(OT i_value, const bits_type i_offset = 0)
         {
             // Compile time check to make sure OT is integral
             static_assert( std::is_integral<OT>::value,
@@ -198,8 +198,8 @@ class buffer
         /// @note 0 is left-most
         /// @return FAPI2_RC_SUCCESS if OK
         ///
-        inline fapi2::ReturnCode setBit(const bits_type& i_bit,
-                                        const bits_type& i_count = 1)
+        inline fapi2::ReturnCodes setBit(const bits_type& i_bit,
+                                         const bits_type& i_count = 1)
         {
             if ((i_count + i_bit - 1) >= TT::bits_per_unit())
             {
@@ -238,8 +238,8 @@ class buffer
         /// @note 0 is left-most
         /// @return FAPI2_RC_SUCCESS if OK
         ///
-        inline fapi2::ReturnCode clearBit(const bits_type& i_bit,
-                                          const bits_type& i_count = 1)
+        inline fapi2::ReturnCodes clearBit(const bits_type& i_bit,
+                                           const bits_type& i_count = 1)
         {
             if ((i_count + i_bit - 1) >= TT::bits_per_unit())
             {
@@ -515,8 +515,8 @@ class buffer
         /// @return FAPI2_RC_SUCCESS if successful
         ///
         template<typename OT>
-        fapi2::ReturnCode insert(const OT i_datain, const bits_type i_targetStart,
-                                 const bits_type i_len, const bits_type i_sourceStart = 0)
+        fapi2::ReturnCodes insert(const OT i_datain, const bits_type i_targetStart,
+                                  const bits_type i_len, const bits_type i_sourceStart = 0)
         {
             const bits_type target_length = parameterTraits<T>::bit_length();
             const bits_type source_length = parameterTraits<OT>::bit_length();
@@ -613,9 +613,9 @@ class buffer
         /// @note Data is assumed to be aligned on the word boundary of L
         ///
         template<typename OT>
-        fapi2::ReturnCode insertFromRight(const OT i_datain,
-                                          const bits_type i_targetStart,
-                                          const bits_type i_len)
+        fapi2::ReturnCodes insertFromRight(const OT i_datain,
+                                           const bits_type i_targetStart,
+                                           const bits_type i_len)
         {
             // Error if input data don't make sense
             if ((i_targetStart + i_len) > parameterTraits<T>::bit_length())
@@ -690,8 +690,8 @@ class buffer
         /// @return FAPI2_RC_SUCCESS if ok
         ///
         template<typename OT>
-        fapi2::ReturnCode extract(OT& o_out, const bits_type i_sourceStart,
-                                  const bits_type i_len, const bits_type i_targetStart = 0) const
+        fapi2::ReturnCodes extract(OT& o_out, const bits_type i_sourceStart,
+                                   const bits_type i_len, const bits_type i_targetStart = 0) const
         {
             // Extraction is just an insert into o_out
 
@@ -746,8 +746,8 @@ class buffer
         /// @return FAPI2_RC_SUCCESS if ok
         ///
         template<typename OT>
-        fapi2::ReturnCode extractToRight(OT& o_out, const bits_type i_sourceStart,
-                                         const bits_type i_len) const
+        fapi2::ReturnCodes extractToRight(OT& o_out, const bits_type i_sourceStart,
+                                          const bits_type i_len) const
         {
             return extract(o_out, i_sourceStart, i_len,
                            parameterTraits<OT>::bit_length() - i_len);
diff --git a/import/hwpf/fapi2/include/fapi2_error_scope.H b/import/hwpf/fapi2/include/fapi2_error_scope.H
index e45a2101..278e1417 100644
--- a/import/hwpf/fapi2/include/fapi2_error_scope.H
+++ b/import/hwpf/fapi2/include/fapi2_error_scope.H
@@ -32,7 +32,6 @@
 
 #include <stdint.h>
 #include <plat_error_scope.H>
-#include <return_code.H>
 #include <hwp_ffdc_classes.H>
 
 /// @cond
@@ -61,9 +60,9 @@
 /// FSP operational states.
 ///
 #ifdef DOXYGEN
-#define FAPI_TRY(__operation__, ...) FAPI_TRY_IMPL
+    #define FAPI_TRY(__operation__, ...) FAPI_TRY_IMPL
 #else
-#define FAPI_TRY(...) FAPI_TRY_IMPL(FAPI_VA_NARGS(__VA_ARGS__), __VA_ARGS__)
+    #define FAPI_TRY(...) FAPI_TRY_IMPL(FAPI_VA_NARGS(__VA_ARGS__), __VA_ARGS__)
 #endif
 
 ///