diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr/fapi2/test/fapi2HwpErrorBufferTest.H | 15 | ||||
| -rw-r--r-- | src/usr/fapi2/test/rcSupport.C | 23 | ||||
| -rw-r--r-- | src/usr/fapi2/test/rcSupport.H | 10 |
3 files changed, 14 insertions, 34 deletions
diff --git a/src/usr/fapi2/test/fapi2HwpErrorBufferTest.H b/src/usr/fapi2/test/fapi2HwpErrorBufferTest.H index ab9811ccf..6b6e0706f 100644 --- a/src/usr/fapi2/test/fapi2HwpErrorBufferTest.H +++ b/src/usr/fapi2/test/fapi2HwpErrorBufferTest.H @@ -373,20 +373,8 @@ fapi_try_exit: int l_result = -1; -//The generated classes in hwp_ffdc_classes.H are not produced to support -//fapi2::variable_buffer.In order to enable the following test the -//parseErrorInfo.pl script must be configured to use variable buffers. -//To enable variable buffer support ensure that the parseErrorInfo_RUN -//macro in import/hwpf/fapi2/tools/parseErrorInfo.mk is defined to -//include the --use-variable-buffers option as shown below. -//$(C1) $$< --use-variable-buffers --output-dir=$$($(GENERATED)_PATH) ... - -//Disable unless parseErrorInfo.pl --use-variable-buffers invoked to -//generate hwp_ffdc_classes.H. - do { -#if 0 //get a PROC target for this test. TARGETING::Target *l_procTarget = getProcTarget(); @@ -494,6 +482,8 @@ fapi_try_exit: l_ct = snprintf( l_ptr, l_remain, + (i != 0 && i%4 == 0)? + "\n\t\t Data[%d]: %X ": ", Data[%d]: %X ", i, FAPI2_TEST_VARIABLE_BUFFER_VALUE[i] @@ -536,7 +526,6 @@ fapi_try_exit: break; } -#endif l_result = 0; } diff --git a/src/usr/fapi2/test/rcSupport.C b/src/usr/fapi2/test/rcSupport.C index 537f8567f..84ecb84e6 100644 --- a/src/usr/fapi2/test/rcSupport.C +++ b/src/usr/fapi2/test/rcSupport.C @@ -41,7 +41,18 @@ const uint64_t FAPI2_TEST_BUFFER_VALUE = 0x123456789ABCDEF; const uint32_t FAPI2_TEST_VARIABLE_BUFFER_VALUE[] = { 0x12345678, - 0x9ABCDEF + 0x23456781, + 0x34567812, + 0x45678123, + 0x56781234, + 0x67812345, + 0x78123456, + 0x81234567, + 0x9ABCDEF, + 0xABCDEF9, + 0xBCDEF9A, + 0xCDEF9AB, + 0xDEF9ABC }; const uint32_t VARIABLE_BUFFER_ELEMENTS = sizeof(FAPI2_TEST_VARIABLE_BUFFER_VALUE)/ @@ -210,15 +221,6 @@ fapi_try_exit: return fapi2::current_err; } -#if 0 -//The generated classes in hwp_ffdc_classes.H are not produced to support -//fapi2::variable_buffer.In order to enable the following function the -//parseErrorInfo.pl script must be configured to use variable buffers. -//To enable variable buffer support ensure that the parseErrorInfo_RUN -//macro in import/hwpf/fapi2/tools/parseErrorInfo.mk is defined to -//include the --use-variable-buffers option as shown below. -//$(C1) $$< --use-variable-buffers --output-dir=$$($(GENERATED)_PATH) ... -// //**************************************************************************** // p9ErrorWithVariableBuffer // Force an error that will use a caller populated fapi2::variable_buffer @@ -251,6 +253,5 @@ fapi_try_exit: FAPI_INF("Exiting p9ErrorWithVariableBuffer"); return fapi2::current_err; } -#endif diff --git a/src/usr/fapi2/test/rcSupport.H b/src/usr/fapi2/test/rcSupport.H index 1968bcf2f..e2e22fa3e 100644 --- a/src/usr/fapi2/test/rcSupport.H +++ b/src/usr/fapi2/test/rcSupport.H @@ -92,21 +92,11 @@ fapi2::ReturnCode p9_hwCallout( fapi2::ReturnCode p9ErrorWithBuffer( fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target); -#if 0 -//The generated classes in hwp_ffdc_classes.H are not produced to support -//fapi2::variable_buffer.In order to enable the following function the -//parseErrorInfo.pl script must be configured to use variable buffers. -//To enable variable buffer support ensure that the parseErrorInfo_RUN -//macro in import/hwpf/fapi2/tools/parseErrorInfo.mk is defined to -//include the --use-variable-buffers option as shown below. -//$(C1) $$< --use-variable-buffers --output-dir=$$($(GENERATED)_PATH) ... - //***************************************************************************** // p9ErrorWithVariableBuffer // Force an error that will use a caller populated fapi2::variable_buffer //***************************************************************************** fapi2::ReturnCode p9ErrorWithVariableBuffer( fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target); -#endif #endif |
