diff options
Diffstat (limited to 'src')
22 files changed, 306 insertions, 155 deletions
diff --git a/src/include/usr/hwpf/fapi/fapi.H b/src/include/usr/hwpf/fapi/fapi.H index b7d2ea3c4..892a2a60a 100644 --- a/src/include/usr/hwpf/fapi/fapi.H +++ b/src/include/usr/hwpf/fapi/fapi.H @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2011,2013 */ +/* COPYRIGHT International Business Machines Corp. 2011,2014 */ /* */ /* p1 */ /* */ @@ -20,6 +20,9 @@ /* Origin: 30 */ /* */ /* IBM_PROLOG_END_TAG */ +// $Id: fapi.H,v 1.9 2013/10/15 13:13:28 dcrowell Exp $ +// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/hwpf/working/fapi/fapi.H,v $ + /** * @file fapi.H * diff --git a/src/include/usr/hwpf/fapi/fapiAttributeService.H b/src/include/usr/hwpf/fapi/fapiAttributeService.H index cc98b5778..b774b593e 100644 --- a/src/include/usr/hwpf/fapi/fapiAttributeService.H +++ b/src/include/usr/hwpf/fapi/fapiAttributeService.H @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2011,2013 */ +/* COPYRIGHT International Business Machines Corp. 2011,2014 */ /* */ /* p1 */ /* */ @@ -20,6 +20,9 @@ /* Origin: 30 */ /* */ /* IBM_PROLOG_END_TAG */ +// $Id: fapiAttributeService.H,v 1.12 2013/10/15 13:11:08 dcrowell Exp $ +// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/hwpf/working/fapi/fapiAttributeService.H,v $ + /** * @file fapiAttributeService.H * diff --git a/src/include/usr/hwpf/fapi/fapiChipEcFeature.H b/src/include/usr/hwpf/fapi/fapiChipEcFeature.H index d20b300d9..2a47e2368 100644 --- a/src/include/usr/hwpf/fapi/fapiChipEcFeature.H +++ b/src/include/usr/hwpf/fapi/fapiChipEcFeature.H @@ -1,26 +1,28 @@ -/* IBM_PROLOG_BEGIN_TAG - * This is an automatically generated prolog. - * - * $Source: src/include/usr/hwpf/fapi/fapiChipEcFeature.H $ - * - * IBM CONFIDENTIAL - * - * COPYRIGHT International Business Machines Corp. 2012 - * - * p1 - * - * Object Code Only (OCO) source materials - * Licensed Internal Code Source Materials - * IBM HostBoot Licensed Internal Code - * - * The source code for this program is not published or other- - * wise divested of its trade secrets, irrespective of what has - * been deposited with the U.S. Copyright Office. - * - * Origin: 30 - * - * IBM_PROLOG_END_TAG - */ +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/include/usr/hwpf/fapi/fapiChipEcFeature.H $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ +// $Id: fapiChipEcFeature.H,v 1.4 2013/10/15 13:13:23 dcrowell Exp $ +// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/hwpf/working/fapi/fapiChipEcFeature.H,v $ + /** * @file fapiChipEcFeature.H * diff --git a/src/include/usr/hwpf/fapi/fapiErrorInfo.H b/src/include/usr/hwpf/fapi/fapiErrorInfo.H index fe6db4544..23250aa51 100644 --- a/src/include/usr/hwpf/fapi/fapiErrorInfo.H +++ b/src/include/usr/hwpf/fapi/fapiErrorInfo.H @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2011,2013 */ +/* COPYRIGHT International Business Machines Corp. 2011,2014 */ /* */ /* p1 */ /* */ @@ -20,6 +20,9 @@ /* Origin: 30 */ /* */ /* IBM_PROLOG_END_TAG */ +// $Id: fapiErrorInfo.H,v 1.11 2013/11/11 19:33:43 mjjones Exp $ +// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/hwpf/working/fapi/fapiErrorInfo.H,v $ + /** * @file fapiErrorInfo.H * diff --git a/src/include/usr/hwpf/fapi/fapiHwAccess.H b/src/include/usr/hwpf/fapi/fapiHwAccess.H index c4613b3ec..2691b86c3 100644 --- a/src/include/usr/hwpf/fapi/fapiHwAccess.H +++ b/src/include/usr/hwpf/fapi/fapiHwAccess.H @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2011,2013 */ +/* COPYRIGHT International Business Machines Corp. 2011,2014 */ /* */ /* p1 */ /* */ @@ -20,6 +20,9 @@ /* Origin: 30 */ /* */ /* IBM_PROLOG_END_TAG */ +// $Id: fapiHwAccess.H,v 1.12 2014/01/20 20:57:09 mjjones Exp $ +// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/hwpf/working/fapi/fapiHwAccess.H,v $ + /** * @file fapiHwAccess.H * @@ -42,8 +45,10 @@ * 836579 thi May 22,2012 Spy/Ring supports * mjjones 07/12/2012 Add mode options to Ring funcs * rjknight 09/20/2012 Update fapiSpy interfaces to - * allow string inputs for cronus - * jknight 04/02/2013 Add fapi get/setSpyImage + * F876964 jknight Apr, 02,2013 fapi get/setSpyImage + * F873646 srimeesa Mar 10,2013 64Bit SPYID and + * ClockDomain ID support + * F883863 atendolk 05/06/2013 Add MultiScom support */ #ifndef FAPIHWACCESS_H_ @@ -58,6 +63,11 @@ #include <fapiReturnCode.H> #include <fapiTarget.H> +#ifdef FAPI_SUPPORT_MULTI_SCOM +#include <fapiMultiScom.H> +#endif + + namespace fapi { /** @@ -87,6 +97,9 @@ namespace fapi extern "C" { +typedef uint64_t spyId_t; +typedef uint64_t scanRingId_t; + //------------------------------------------------------------------------------ // HW Communication Functions //------------------------------------------------------------------------------ @@ -177,7 +190,7 @@ fapi::ReturnCode fapiModifyCfamRegister(const fapi::Target& i_target, * @return ReturnCode. Zero on success, else platform specified error */ fapi::ReturnCode fapiGetRing(const fapi::Target& i_target, - const uint32_t i_address, + const scanRingId_t i_address, ecmdDataBufferBase & o_data, const uint32_t i_ringMode = 0); @@ -191,7 +204,7 @@ fapi::ReturnCode fapiGetRing(const fapi::Target& i_target, * @return ReturnCode. Zero on success, else platform specified error */ fapi::ReturnCode fapiPutRing(const fapi::Target& i_target, - const uint32_t i_address, + const scanRingId_t i_address, ecmdDataBufferBase & i_data, const uint32_t i_ringMode = 0); @@ -206,7 +219,7 @@ fapi::ReturnCode fapiPutRing(const fapi::Target& i_target, * @return ReturnCode. Zero on success, else platform specified error */ fapi::ReturnCode fapiModifyRing(const fapi::Target& i_target, - const uint32_t i_address, + const scanRingId_t i_address, ecmdDataBufferBase & i_data, const fapi::ChipOpModifyMode i_modifyMode, const uint32_t i_ringMode = 0); @@ -261,7 +274,7 @@ fapi::ReturnCode fapiModifyRing(const fapi::Target& i_target, #define fapiGetSpy(TARGET, ID, DATA) _fapiGetSpy(TARGET, FAPI_SPY_NAMES::ID.value, DATA ) fapi::ReturnCode _fapiGetSpy(const fapi::Target& i_target, - const uint32_t i_spyId, + const spyId_t i_spyId, ecmdDataBufferBase & o_data); #endif @@ -318,7 +331,7 @@ fapi::ReturnCode _fapiGetSpy(const fapi::Target& i_target, */ #define fapiPutSpy(TARGET, ID, DATA) _fapiPutSpy(TARGET, FAPI_SPY_NAMES::ID.value, DATA) fapi::ReturnCode _fapiPutSpy(const fapi::Target& i_target, - const uint32_t i_spyId, + const spyId_t i_spyId, ecmdDataBufferBase & i_data); #endif @@ -354,7 +367,7 @@ fapi::ReturnCode _fapiPutSpy(const fapi::Target& i_target, FAPI_SPY_NAMES::ID.value, \ DATA1, DATA2) fapi::ReturnCode _fapiPutSpyImage(const fapi::Target& i_target, - const uint32_t i_spyId, + const spyId_t i_spyId, const ecmdDataBufferBase & i_data, ecmdDataBufferBase & o_imageData); #endif @@ -393,7 +406,7 @@ fapi::ReturnCode _fapiPutSpyImage(const fapi::Target& i_target, FAPI_SPY_NAMES::ID.value, \ DATA1, DATA2) fapi::ReturnCode _fapiGetSpyImage(const fapi::Target& i_target, - const uint32_t i_spyId, + const spyId_t i_spyId, ecmdDataBufferBase & o_data, const ecmdDataBufferBase & i_imageData); #endif @@ -409,6 +422,52 @@ fapi::ReturnCode _fapiGetSpyImage(const fapi::Target& i_target, const ecmdDataBufferBase & i_imageData); #endif +#ifdef FAPI_SUPPORT_MULTI_SCOM +/** + * @brief Performs a multiple SCOM operation + * + * @par Description: + * This interface performs multiple SCOM operations on a chip or chiplet, + * in the order specified by the input MultiScom object. See fapiMultiScom.H + * for details of how to populate the MultiScom object with SCOM operations + * + * @param[in] i_target Chip/Chiplet target to do MultiScom on + * @param[in/out] io_MultiScomObj Reference to a MultiScom object, + * pre-populated with SingleScomInfo entries + * to perform multiple SCOMs on input target + * @return ReturnCode Zero on success, else platform specified + * error + * + * @note This is a synchronous interface and would return after all the SCOM + * operations are completed or on the first failed SCOM operation + * + * @note SCOMs will be performed in the order they were added to the input + * MultiScom object + * + * @note In case of errors, the platform code is responsible to collect and + * add all the required error info and FFDC into the error data for + * debugging + * + * @note If the SCOM operations added are specific to a processor chip, + * then the FSI Shift Engine configured in scatter-gather DMA mode + * extension would be used to execute the SCOM operations in a + * performance optimize mode. In this mode, the special + * SCOM_BULK_READ_MODE and SCOM_BULK_WRITE_MODE operations are + * supported that allow a large bulk of SCOM access (in multiple of 64 + * bits) for targets that support auto-increment. The + * SCOM_WRITE_UNDER_MASK operation is not supported in this mode + * + * @note If the SCOM operations added are specific to a memory buffer chip, + * then the regular SCOM engine is used to execute the SCOM operations. + * SCOM_WRITE_UNDER_MASK operation is supported in this mode, but the + * special SCOM_BULK_READ_MODE and SCOM_BULK_WRITE_MODE operations are + * not supported due to hardware limitations. + */ +fapi::ReturnCode fapiMultiScom ( + const fapi::Target& i_target, + fapi::MultiScom& io_multiScomObj); +#endif // FAPI_SUPPORT_MULTI_SCOM + } // extern "C" diff --git a/src/include/usr/hwpf/fapi/fapiHwpExecutor.H b/src/include/usr/hwpf/fapi/fapiHwpExecutor.H index d3876945e..d1f5c87a7 100644 --- a/src/include/usr/hwpf/fapi/fapiHwpExecutor.H +++ b/src/include/usr/hwpf/fapi/fapiHwpExecutor.H @@ -1,25 +1,28 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/include/usr/hwpf/fapi/fapiHwpExecutor.H $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2011 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/include/usr/hwpf/fapi/fapiHwpExecutor.H $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2011,2014 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ +// $Id: fapiHwpExecutor.H,v 1.5 2013/10/15 13:13:31 dcrowell Exp $ +// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/hwpf/working/fapi/fapiHwpExecutor.H,v $ + /** * @file fapiHwpExecutor.H * diff --git a/src/include/usr/hwpf/fapi/fapiMBvpdAccess.H b/src/include/usr/hwpf/fapi/fapiMBvpdAccess.H index 356b65185..6db2eaf5b 100644 --- a/src/include/usr/hwpf/fapi/fapiMBvpdAccess.H +++ b/src/include/usr/hwpf/fapi/fapiMBvpdAccess.H @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2013 */ +/* COPYRIGHT International Business Machines Corp. 2013,2014 */ /* */ /* p1 */ /* */ @@ -20,7 +20,7 @@ /* Origin: 30 */ /* */ /* IBM_PROLOG_END_TAG */ -// $Id: fapiMBvpdAccess.H,v 1.8 2013/11/21 14:52:26 whs Exp $ +// $Id: fapiMBvpdAccess.H,v 1.9 2014/01/20 20:03:18 mjjones Exp $ /** * @file fapiMBvpdAccess.H * diff --git a/src/include/usr/hwpf/fapi/fapiMvpdAccess.H b/src/include/usr/hwpf/fapi/fapiMvpdAccess.H index 9fdafcec9..a6251efb9 100644 --- a/src/include/usr/hwpf/fapi/fapiMvpdAccess.H +++ b/src/include/usr/hwpf/fapi/fapiMvpdAccess.H @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2013 */ +/* COPYRIGHT International Business Machines Corp. 2012,2014 */ /* */ /* p1 */ /* */ @@ -20,7 +20,9 @@ /* Origin: 30 */ /* */ /* IBM_PROLOG_END_TAG */ -// $Id: fapiMvpdAccess.H,v 1.2 2012/10/09 21:32:55 mjjones Exp $ +// $Id: fapiMvpdAccess.H,v 1.7 2013/10/15 13:13:34 dcrowell Exp $ +// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/hwpf/working/fapi/fapiMvpdAccess.H,v $ + /** * @file fapiMvpdAccess.H * diff --git a/src/include/usr/hwpf/fapi/fapiPlatHwAccess.H b/src/include/usr/hwpf/fapi/fapiPlatHwAccess.H index 2b217b798..6f2d8824b 100644 --- a/src/include/usr/hwpf/fapi/fapiPlatHwAccess.H +++ b/src/include/usr/hwpf/fapi/fapiPlatHwAccess.H @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2011,2013 */ +/* COPYRIGHT International Business Machines Corp. 2011,2014 */ /* */ /* p1 */ /* */ @@ -20,25 +20,28 @@ /* Origin: 30 */ /* */ /* IBM_PROLOG_END_TAG */ +// $Id: fapiPlatHwAccess.H,v 1.10 2014/01/20 20:58:47 mjjones Exp $ +// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/hwpf/working/fapi/fapiPlatHwAccess.H,v $ + /** * @file fapiPlatHwAccess.H * - * @brief Defines hardware-access functions for the platform layer. - * Hardware procedure writers will not call these functions. - * + * @brief Defines hardware-access functions for the platform layer. + * Hardware procedure writers will not call these functions. + * * Implementors of platform code will provide worker routines * for these functions in file hwpf/plat/fapiPlatHwAccess.C. * fapi.H will not include this file, so platform implementors - * will have to include this file explicitly. - * - * These platform entry points are called by fapi functions from - * hwpf/fapi/fapiHwAccess.C which are wrapper functions that - * output scand traces common to all platforms. - * + * will have to include this file explicitly. + * + * These platform entry points are called by fapi functions from + * hwpf/fapi/fapiHwAccess.C which are wrapper functions that + * output scand traces common to all platforms. + * * These functions have the same argument signatures as the - * fapi-level functions, but the function names her start with + * fapi-level functions, but the function names her start with * "plat." - * + * */ /* @@ -50,7 +53,10 @@ * 836579 thi May 22,2012 Spy/Ring supports * mjjones 07/12/2012 Add Pulse mode option to * Ring funcs - * jknight 04/02/2013 Add fapi get/setSpyImage + * F876964 jknight Apr, 02,2013 fapi get/setSpyImage + * F873646 srimeesa Mar 10,2013 64Bit SPYID and + * ClockDomain ID support + * F883863 atendolk May 16,2013 fapi MultiScom support */ #ifndef FAPIPLATHWACCESS_H_ @@ -60,7 +66,9 @@ #include <ecmdDataBufferBase.H> #include <fapiReturnCode.H> #include <fapiTarget.H> - +#ifdef FAPI_SUPPORT_MULTI_SCOM +#include <fapiMultiScom.H> +#endif extern "C" { @@ -73,8 +81,8 @@ extern "C" /** * @brief Platform-level implementation called by GetScom() * Hardware procedures writers will not call this function. - * - * + * + * * @param[in] i_target Target to operate on * @param[in] i_address Scom address to read from * @param[out] o_data ecmdDataBufferBase object that holds data read from @@ -89,7 +97,7 @@ fapi::ReturnCode platGetScom(const fapi::Target& i_target, /** * @brief Platform-level implementation called by PutScom(). * Hardware procedures writers will not call this function. - * + * * @param[in] i_target Target to operate on * @param[in] i_address Scom address to write to * @param[in] i_data ecmdDataBufferBase object that holds data to write into @@ -104,7 +112,7 @@ fapi::ReturnCode platPutScom(const fapi::Target& i_target, /** * @brief Platform-level implementation called by PutScomUnderMask() * Hardware procedures writers will not call this function. - * + * * @param[in] i_target Target to operate on * @param[in] i_address Scom address to write to * @param[in] i_data ecmdDataBufferBase object that holds the data @@ -117,11 +125,24 @@ fapi::ReturnCode platPutScomUnderMask(const fapi::Target& i_target, ecmdDataBufferBase & i_data, ecmdDataBufferBase & i_mask); +#ifdef FAPI_SUPPORT_MULTI_SCOM +/** + * @brief Platform-level implementation called by fapiMultiScom() + * Hardware procedures writers will not call this function. + * + * @param[in] i_target Target to operate on + * @param[inout] io_multiScomList MultiScom object pre-populated with SCOMs to + * be performed on i_target + * @return ReturnCode Zero on success, else platform specified error + */ +fapi::ReturnCode platMultiScom (const fapi::Target& i_target, + fapi::MultiScom& io_multiScomList); +#endif /** * @brief Platorm-level implementation called by GetCfamRegister() * Hardware procedures writers will not call this function. - * + * * @param[in] i_target Target to operate on * @param[in] i_address CFAM address to read from * @param[out] o_data ecmdDataBufferBase object that holds data read from @@ -136,7 +157,7 @@ fapi::ReturnCode platGetCfamRegister(const fapi::Target& i_target, /** * @brief Platform-level implementation called by PutCfamRegister() * Hardware procedures writers will not call this function. - * + * * @param[in] i_target Target to operate on * @param[in] i_address CFAM address to write to * @param[in] i_data ecmdDataBufferBase object that holds data to write into @@ -151,7 +172,7 @@ fapi::ReturnCode platPutCfamRegister(const fapi::Target& i_target, /** * @brief Platform-level implementation of ModifyCfamRegister() * Hardware procedures writers will not call this function. - * + * * @param[in] i_target Target to operate on * @param[in] i_address CFAM address to write to * @param[in] i_data ecmdDataBufferBase object that holds the modifying data @@ -167,7 +188,7 @@ fapi::ReturnCode platModifyCfamRegister(const fapi::Target& i_target, /** * @brief Platform-level implementation called by fapiGetRing() * Hardware procedures writers will not call this function. - * + * * @param[in] i_target Target to operate on * @param[in] i_address Ring address to read from * @param[out] o_data ecmdDataBufferBase object that holds data read from @@ -176,7 +197,7 @@ fapi::ReturnCode platModifyCfamRegister(const fapi::Target& i_target, * @return ReturnCode. Zero on success, else platform specified error */ fapi::ReturnCode platGetRing(const fapi::Target& i_target, - const uint32_t i_address, + const scanRingId_t i_address, ecmdDataBufferBase & o_data, const uint32_t i_ringMode); @@ -193,7 +214,7 @@ fapi::ReturnCode platGetRing(const fapi::Target& i_target, * @return ReturnCode. Zero on success, else platform specified error */ fapi::ReturnCode platPutRing(const fapi::Target& i_target, - const uint32_t i_address, + const scanRingId_t i_address, ecmdDataBufferBase & i_data, const uint32_t i_ringMode); @@ -210,7 +231,7 @@ fapi::ReturnCode platPutRing(const fapi::Target& i_target, * @return ReturnCode. Zero on success, else platform specified error */ fapi::ReturnCode platModifyRing(const fapi::Target& i_target, - const uint32_t i_address, + const scanRingId_t i_address, ecmdDataBufferBase & i_data, const fapi::ChipOpModifyMode i_modifyMode, const uint32_t i_ringMode); @@ -232,7 +253,7 @@ fapi::ReturnCode platModifyRing(const fapi::Target& i_target, */ #ifdef FAPI_SUPPORT_SPY_AS_ENUM fapi::ReturnCode platGetSpy(const fapi::Target& i_target, - const uint32_t i_spyId, + const spyId_t i_spyId, ecmdDataBufferBase & o_data); #endif @@ -246,7 +267,7 @@ fapi::ReturnCode platGetSpy(const fapi::Target& i_target, * @return ReturnCode. Zero on success, else platform specified error * * @note: This is only supported in the cronus environment - * it will not compile in FSP code + * it will not compile in FSP code */ fapi::ReturnCode platGetSpy(const fapi::Target& i_target, const char * const i_spyId, @@ -266,7 +287,7 @@ fapi::ReturnCode platGetSpy(const fapi::Target& i_target, * @return ReturnCode. Zero on success, else platform specified error */ fapi::ReturnCode platPutSpy(const fapi::Target& i_target, - const uint32_t i_spyId, + const spyId_t i_spyId, ecmdDataBufferBase & i_data); #endif @@ -288,7 +309,7 @@ fapi::ReturnCode platPutSpy(const fapi::Target& i_target, * @return ReturnCode. Zero on success, else platform specified error */ fapi::ReturnCode platGetSpyImage(const fapi::Target& i_target, - const uint32_t i_spyId, + const spyId_t i_spyId, ecmdDataBufferBase & o_data, const ecmdDataBufferBase & i_imageData); #endif @@ -322,7 +343,7 @@ fapi::ReturnCode platGetSpyImage(const fapi::Target& i_target, * @return ReturnCode. Zero on success, else platform specified error */ fapi::ReturnCode platPutSpyImage(const fapi::Target& i_target, - const uint32_t i_spyId, + const spyId_t i_spyId, const ecmdDataBufferBase & i_data, ecmdDataBufferBase & io_imageData); #endif diff --git a/src/include/usr/hwpf/fapi/fapiReturnCode.H b/src/include/usr/hwpf/fapi/fapiReturnCode.H index f637bc701..9265d0750 100644 --- a/src/include/usr/hwpf/fapi/fapiReturnCode.H +++ b/src/include/usr/hwpf/fapi/fapiReturnCode.H @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2011,2013 */ +/* COPYRIGHT International Business Machines Corp. 2011,2014 */ /* */ /* p1 */ /* */ @@ -20,6 +20,10 @@ /* Origin: 30 */ /* */ /* IBM_PROLOG_END_TAG */ +// $Id: fapiReturnCode.H,v 1.19 2013/11/11 19:33:31 mjjones Exp $ +// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/hwpf/working/fapi/fapiReturnCode.H,v $ + + /** * @file fapiReturnCode.H * diff --git a/src/include/usr/hwpf/fapi/fapiReturnCodeDataRef.H b/src/include/usr/hwpf/fapi/fapiReturnCodeDataRef.H index 94f04618a..2bc468ba9 100644 --- a/src/include/usr/hwpf/fapi/fapiReturnCodeDataRef.H +++ b/src/include/usr/hwpf/fapi/fapiReturnCodeDataRef.H @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2011,2013 */ +/* COPYRIGHT International Business Machines Corp. 2011,2014 */ /* */ /* p1 */ /* */ @@ -20,6 +20,9 @@ /* Origin: 30 */ /* */ /* IBM_PROLOG_END_TAG */ +// $Id: fapiReturnCodeDataRef.H,v 1.7 2013/10/15 13:13:38 dcrowell Exp $ +// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/hwpf/working/fapi/fapiReturnCodeDataRef.H,v $ + /** * @file fapiReturnCodeDataRef.H * diff --git a/src/include/usr/hwpf/fapi/fapiReturnCodes.H b/src/include/usr/hwpf/fapi/fapiReturnCodes.H index 2539bbd2d..d88ce3766 100644 --- a/src/include/usr/hwpf/fapi/fapiReturnCodes.H +++ b/src/include/usr/hwpf/fapi/fapiReturnCodes.H @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2011,2012 */ +/* COPYRIGHT International Business Machines Corp. 2011,2014 */ /* */ /* p1 */ /* */ @@ -20,6 +20,9 @@ /* Origin: 30 */ /* */ /* IBM_PROLOG_END_TAG */ +// $Id: fapiReturnCodes.H,v 1.13 2013/10/15 13:13:40 dcrowell Exp $ +// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/hwpf/working/fapi/fapiReturnCodes.H,v $ + /** * @file fapiReturnCodes.H * @@ -83,6 +86,9 @@ enum ReturnCodes // HWP attempted to create an unrecognized SBE error FAPI_RC_UNRECOGNIZED_SBE_ERROR = FAPI_RC_FAPI_MASK | 0x03, + // Invalid parameters passed to a FAPI interface + FAPI_RC_INVALID_PARAM = FAPI_RC_FAPI_MASK | 0x04, + //-------------------------------------------------------------------------- // PLAT generated return codes. Additional details may be contained in // ReturnCode platData (this can only be looked at by PLAT code) diff --git a/src/include/usr/hwpf/fapi/fapiSystemConfig.H b/src/include/usr/hwpf/fapi/fapiSystemConfig.H index 944eeb940..52ee509fa 100644 --- a/src/include/usr/hwpf/fapi/fapiSystemConfig.H +++ b/src/include/usr/hwpf/fapi/fapiSystemConfig.H @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2011,2013 */ +/* COPYRIGHT International Business Machines Corp. 2011,2014 */ /* */ /* p1 */ /* */ @@ -20,6 +20,9 @@ /* Origin: 30 */ /* */ /* IBM_PROLOG_END_TAG */ +// $Id: fapiSystemConfig.H,v 1.6 2013/10/15 13:13:41 dcrowell Exp $ +// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/hwpf/working/fapi/fapiSystemConfig.H,v $ + /** * @file fapiSystemConfig.H * diff --git a/src/include/usr/hwpf/fapi/fapiTarget.H b/src/include/usr/hwpf/fapi/fapiTarget.H index 47f0ff8f9..b1c98efb0 100644 --- a/src/include/usr/hwpf/fapi/fapiTarget.H +++ b/src/include/usr/hwpf/fapi/fapiTarget.H @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2011,2013 */ +/* COPYRIGHT International Business Machines Corp. 2011,2014 */ /* */ /* p1 */ /* */ @@ -20,6 +20,9 @@ /* Origin: 30 */ /* */ /* IBM_PROLOG_END_TAG */ +// $Id: fapiTarget.H,v 1.8 2013/10/15 13:13:43 dcrowell Exp $ +// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/hwpf/working/fapi/fapiTarget.H,v $ + /** * @file fapiTarget.H * diff --git a/src/include/usr/hwpf/fapi/fapiUtil.H b/src/include/usr/hwpf/fapi/fapiUtil.H index b00a6c71b..054e0aa0b 100644 --- a/src/include/usr/hwpf/fapi/fapiUtil.H +++ b/src/include/usr/hwpf/fapi/fapiUtil.H @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2011,2013 */ +/* COPYRIGHT International Business Machines Corp. 2011,2014 */ /* */ /* p1 */ /* */ @@ -20,6 +20,9 @@ /* Origin: 30 */ /* */ /* IBM_PROLOG_END_TAG */ +// $Id: fapiUtil.H,v 1.19 2013/11/11 19:33:49 mjjones Exp $ +// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/hwpf/working/fapi/fapiUtil.H,v $ + /** * @file fapiUtil.H * diff --git a/src/usr/hwpf/fapi/fapiErrorInfo.C b/src/usr/hwpf/fapi/fapiErrorInfo.C index ecac27b76..b72534012 100644 --- a/src/usr/hwpf/fapi/fapiErrorInfo.C +++ b/src/usr/hwpf/fapi/fapiErrorInfo.C @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2011,2013 */ +/* COPYRIGHT International Business Machines Corp. 2011,2014 */ /* */ /* p1 */ /* */ @@ -20,6 +20,9 @@ /* Origin: 30 */ /* */ /* IBM_PROLOG_END_TAG */ +// $Id: fapiErrorInfo.C,v 1.11 2013/11/11 19:33:45 mjjones Exp $ +// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/hwpf/working/fapi/fapiErrorInfo.C,v $ + /** * @file fapiErrorInfo.C * diff --git a/src/usr/hwpf/fapi/fapiHwAccess.C b/src/usr/hwpf/fapi/fapiHwAccess.C index 98fa0802a..8c54e4d8c 100644 --- a/src/usr/hwpf/fapi/fapiHwAccess.C +++ b/src/usr/hwpf/fapi/fapiHwAccess.C @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2011,2013 */ +/* COPYRIGHT International Business Machines Corp. 2011,2014 */ /* */ /* p1 */ /* */ @@ -20,6 +20,9 @@ /* Origin: 30 */ /* */ /* IBM_PROLOG_END_TAG */ +// $Id: fapiHwAccess.C,v 1.14 2013/10/15 13:13:29 dcrowell Exp $ +// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/hwpf/working/fapi/fapiHwAccess.C,v $ + /** * @file fapiHwAccess.C * @@ -45,8 +48,11 @@ * Ring funcs * rjknight 09/20/2012 Update fapiGetSpy to take * a string as input - * jknight 04/02/2013 Add fapi put/getSpyImage + * F876964 jknight Apr, 02,2013 fapi get/setSpyImage * support + * F873646 srimeesa Mar 10,2013 64Bit SPYID and + * ClockDomain ID support + * F883863 atendolk 05/06/2013 Update to support MultiScom */ #include <fapi.H> #include <fapiPlatHwAccess.H> @@ -148,6 +154,43 @@ fapi::ReturnCode fapiPutScomUnderMask(const fapi::Target& i_target, } //****************************************************************************** +// fapiMultiScom function +//****************************************************************************** +#ifdef FAPI_SUPPORT_MULTI_SCOM +fapi::ReturnCode fapiMultiScom ( + const fapi::Target& i_target, + fapi::MultiScom& io_multiScomObj) +{ + FAPI_DBG (ENTER_MRK "fapiMultiScom - i_target: %s, # input ops: %d", + i_target.toEcmdString (), io_multiScomObj.iv_ScomList.size ()); + + fapi::ReturnCode l_rc; + + // Call the platform specific implemetation + l_rc = platMultiScom (i_target, io_multiScomObj); + + if (!l_rc.ok ()) + { + uint32_t l_retCode = l_rc; + + FAPI_ERR ("fapiMultiScom Failed with RC: 0x%.8X! i_target: %s, " + "# input ops: %d, # ops complete: %d", l_retCode, + i_target.toEcmdString (), + io_multiScomObj.iv_ScomList.size (), + io_multiScomObj.iv_NumOfCompletes); + } + + FAPI_DBG (EXIT_MRK "fapiMultiScom - i_target: %s, # input ops: %d, " + "#ops complete: %d", i_target.toEcmdString (), + io_multiScomObj.iv_ScomList.size (), + io_multiScomObj.iv_NumOfCompletes); + + return l_rc; +} +#endif // FAPI_SUPPORT_MULTI_SCOM + + +//****************************************************************************** // fapiGetCfamRegister function //****************************************************************************** fapi::ReturnCode fapiGetCfamRegister(const fapi::Target& i_target, @@ -262,7 +305,7 @@ fapi::ReturnCode fapiModifyCfamRegister(const fapi::Target& i_target, //////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////// fapi::ReturnCode fapiGetRing(const fapi::Target& i_target, - const uint32_t i_address, + const scanRingId_t i_address, ecmdDataBufferBase & o_data, const uint32_t i_ringMode) { @@ -274,13 +317,13 @@ fapi::ReturnCode fapiGetRing(const fapi::Target& i_target, if (l_rc) { - FAPI_ERR("fapiGetRing failed - Target %s, Addr 0x%.8X", + FAPI_ERR("fapiGetRing failed - Target %s, Addr 0x%.16llX", i_target.toEcmdString(), i_address); } if( l_traceit ) { - FAPI_SCAN( "TRACE : GETRING : %s : %.8X %.16llX", + FAPI_SCAN( "TRACE : GETRING : %s : %.16llX %.16llX", i_target.toEcmdString(), i_address, o_data.getDoubleWord( 0 ) ); @@ -292,7 +335,7 @@ fapi::ReturnCode fapiGetRing(const fapi::Target& i_target, //////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////// fapi::ReturnCode fapiPutRing(const fapi::Target& i_target, - const uint32_t i_address, + const scanRingId_t i_address, ecmdDataBufferBase & i_data, const uint32_t i_ringMode) { @@ -304,13 +347,13 @@ fapi::ReturnCode fapiPutRing(const fapi::Target& i_target, if (l_rc) { - FAPI_ERR("fapiPutRing failed - Target %s, Addr 0x%.8X", - i_target.toEcmdString(), i_address); + FAPI_ERR("fapiPutRing failed - Target %s, Addr 0x%.16llX", + i_target.toEcmdString(), i_address); } if( l_traceit ) { - FAPI_SCAN( "TRACE : PUTRING : %s : %.8X %.16llX", + FAPI_SCAN( "TRACE : PUTRING : %s : %.16llX %.16llX", i_target.toEcmdString(), i_address, i_data.getDoubleWord(0)); @@ -322,7 +365,7 @@ fapi::ReturnCode fapiPutRing(const fapi::Target& i_target, //////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////// fapi::ReturnCode fapiModifyRing(const fapi::Target& i_target, - const uint32_t i_address, + const scanRingId_t i_address, ecmdDataBufferBase & i_data, const fapi::ChipOpModifyMode i_modifyMode, const uint32_t i_ringMode) @@ -335,7 +378,7 @@ fapi::ReturnCode fapiModifyRing(const fapi::Target& i_target, if (l_rc) { - FAPI_ERR("platModifyRing failed - Target %s, Addr 0x%.8X," + FAPI_ERR("platModifyRing failed - Target %s, Addr 0x%.16llX," "ModifyMode 0x%.8X", i_target.toEcmdString(), i_address, i_modifyMode); } @@ -362,7 +405,7 @@ fapi::ReturnCode fapiModifyRing(const fapi::Target& i_target, l_pMode = "?"; } - FAPI_SCAN( "TRACE : MODRING : %s : %.8X %.16llX %s", + FAPI_SCAN( "TRACE : MODRING : %s : %.16llX %.16llX %s", i_target.toEcmdString(), i_address, i_data.getDoubleWord(0), @@ -381,10 +424,9 @@ fapi::ReturnCode fapiModifyRing(const fapi::Target& i_target, //////////////////////////////////////////////////////////////////////////// #ifdef FAPI_SUPPORT_SPY_AS_ENUM fapi::ReturnCode _fapiGetSpy(const fapi::Target& i_target, - const uint32_t i_spyId, + const spyId_t i_spyId, ecmdDataBufferBase & o_data) { - fapi::ReturnCode l_rc; bool l_traceit = platIsScanTraceEnabled(); @@ -393,13 +435,13 @@ fapi::ReturnCode _fapiGetSpy(const fapi::Target& i_target, if (l_rc) { - FAPI_ERR("fapiGetSpy failed - Target %s, SpyId 0x%.8X", + FAPI_ERR("fapiGetSpy failed - Target %s, SpyId 0x%.16llX", i_target.toEcmdString(), i_spyId); } if( l_traceit ) { - FAPI_SCAN( "TRACE : GETSPY : %s : %.8X %.16llX", + FAPI_SCAN( "TRACE : GETSPY : %s : %.16llX %.16llX", i_target.toEcmdString(), i_spyId, o_data.getDoubleWord(0)); @@ -442,7 +484,7 @@ fapi::ReturnCode _fapiGetSpy(const fapi::Target& i_target, //////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////// fapi::ReturnCode _fapiPutSpy(const fapi::Target& i_target, - const uint32_t i_spyId, + const spyId_t i_spyId, ecmdDataBufferBase & i_data) { fapi::ReturnCode l_rc; @@ -453,13 +495,13 @@ fapi::ReturnCode _fapiPutSpy(const fapi::Target& i_target, if (l_rc) { - FAPI_ERR("fapiPutSpy failed - Target %s, SpyId 0x%.8X", - i_target.toEcmdString(), i_spyId); + FAPI_ERR("fapiPutSpy failed - Target %s, SpyId 0x%.16llX", + i_target.toEcmdString(), i_spyId); } if( l_traceit ) { - FAPI_SCAN( "TRACE : PUTSPY : %s : %.8X %.16llX", + FAPI_SCAN( "TRACE : PUTSPY : %s : %.16llX %.16llX", i_target.toEcmdString(), i_spyId, i_data.getDoubleWord(0)); @@ -567,7 +609,7 @@ fapi::ReturnCode _fapiPutSpyImage(const fapi::Target& i_target, //////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////// fapi::ReturnCode _fapiGetSpyImage(const fapi::Target& i_target, - const uint32_t i_spyId, + const spyId_t i_spyId, ecmdDataBufferBase & o_data, const ecmdDataBufferBase & i_imageData) { @@ -580,13 +622,13 @@ fapi::ReturnCode _fapiGetSpyImage(const fapi::Target& i_target, if (l_rc) { - FAPI_ERR("fapiGetSpyImage failed - Target %s, SpyId 0x%.8X", + FAPI_ERR("fapiGetSpyImage failed - Target %s, SpyId 0x%.16llX", i_target.toEcmdString(), i_spyId); } if( l_traceit ) { - FAPI_SCAN( "TRACE : GETSPYIMG : %s : %.8X %.16llX", + FAPI_SCAN( "TRACE : GETSPYIMG : %s : %.16llX %.16llX", i_target.toEcmdString(), i_spyId, o_data.getDoubleWord(0)); @@ -599,7 +641,7 @@ fapi::ReturnCode _fapiGetSpyImage(const fapi::Target& i_target, //////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////// fapi::ReturnCode _fapiPutSpyImage(const fapi::Target& i_target, - const uint32_t i_spyId, + const spyId_t i_spyId, const ecmdDataBufferBase & i_data, ecmdDataBufferBase & io_imageData) { @@ -611,13 +653,13 @@ fapi::ReturnCode _fapiPutSpyImage(const fapi::Target& i_target, if (l_rc) { - FAPI_ERR("fapiPutSpyImage failed - Target %s, SpyId 0x%.8X", + FAPI_ERR("fapiPutSpyImage failed - Target %s, SpyId 0x%.16llX", i_target.toEcmdString(), i_spyId); } if( l_traceit ) { - FAPI_SCAN( "TRACE : PUTSPYIMG : %s : %.8X %.16llX", + FAPI_SCAN( "TRACE : PUTSPYIMG : %s : %.16llX %.16llX", i_target.toEcmdString(), i_spyId, i_data.getDoubleWord(0)); @@ -628,4 +670,3 @@ fapi::ReturnCode _fapiPutSpyImage(const fapi::Target& i_target, } #endif } // extern "C" - diff --git a/src/usr/hwpf/fapi/fapiParseAttributeInfo.pl b/src/usr/hwpf/fapi/fapiParseAttributeInfo.pl index e9443e80f..1cb5cce0e 100755 --- a/src/usr/hwpf/fapi/fapiParseAttributeInfo.pl +++ b/src/usr/hwpf/fapi/fapiParseAttributeInfo.pl @@ -6,7 +6,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2011,2013 +# COPYRIGHT International Business Machines Corp. 2011,2014 # # p1 # @@ -21,6 +21,7 @@ # Origin: 30 # # IBM_PROLOG_END_TAG +# $Id: fapiParseAttributeInfo.pl,v 1.21 2014/01/20 20:35:30 mjjones Exp $ # # Purpose: This perl script will parse HWP Attribute XML files # and add attribute information to a file called fapiAttributeIds.H diff --git a/src/usr/hwpf/fapi/fapiReturnCode.C b/src/usr/hwpf/fapi/fapiReturnCode.C index 6feb1d4e6..0b5312379 100644 --- a/src/usr/hwpf/fapi/fapiReturnCode.C +++ b/src/usr/hwpf/fapi/fapiReturnCode.C @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2011,2013 */ +/* COPYRIGHT International Business Machines Corp. 2011,2014 */ /* */ /* p1 */ /* */ @@ -20,6 +20,9 @@ /* Origin: 30 */ /* */ /* IBM_PROLOG_END_TAG */ +// $Id: fapiReturnCode.C,v 1.18 2013/11/11 19:33:34 mjjones Exp $ +// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/hwpf/working/fapi/fapiReturnCode.C,v $ + /** * @file fapiReturnCode.C * diff --git a/src/usr/hwpf/fapi/fapiReturnCodeDataRef.C b/src/usr/hwpf/fapi/fapiReturnCodeDataRef.C index 8272afbd7..e367d060c 100644 --- a/src/usr/hwpf/fapi/fapiReturnCodeDataRef.C +++ b/src/usr/hwpf/fapi/fapiReturnCodeDataRef.C @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2011,2013 */ +/* COPYRIGHT International Business Machines Corp. 2011,2014 */ /* */ /* p1 */ /* */ @@ -20,6 +20,9 @@ /* Origin: 30 */ /* */ /* IBM_PROLOG_END_TAG */ +// $Id: fapiReturnCodeDataRef.C,v 1.8 2013/10/15 13:13:37 dcrowell Exp $ +// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/hwpf/working/fapi/fapiReturnCodeDataRef.C,v $ + /** * @file fapiReturnCodeDataRef.C * diff --git a/src/usr/hwpf/fapi/fapiTarget.C b/src/usr/hwpf/fapi/fapiTarget.C index 0608ee2ac..057267477 100644 --- a/src/usr/hwpf/fapi/fapiTarget.C +++ b/src/usr/hwpf/fapi/fapiTarget.C @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2011,2013 */ +/* COPYRIGHT International Business Machines Corp. 2011,2014 */ /* */ /* p1 */ /* */ @@ -20,6 +20,9 @@ /* Origin: 30 */ /* */ /* IBM_PROLOG_END_TAG */ +// $Id: fapiTarget.C,v 1.9 2013/10/15 13:13:42 dcrowell Exp $ +// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/hwpf/working/fapi/fapiTarget.C,v $ + /** * @file fapiTarget.C * diff --git a/src/usr/hwpf/plat/fapiPlatHwAccess.C b/src/usr/hwpf/plat/fapiPlatHwAccess.C index 7adb5068a..eac1049a2 100644 --- a/src/usr/hwpf/plat/fapiPlatHwAccess.C +++ b/src/usr/hwpf/plat/fapiPlatHwAccess.C @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2011,2013 */ +/* COPYRIGHT International Business Machines Corp. 2011,2014 */ /* */ /* p1 */ /* */ @@ -20,27 +20,6 @@ /* Origin: 30 */ /* */ /* IBM_PROLOG_END_TAG */ -// This is an automatically generated prolog. -// -// $Source: src/usr/hwpf/plat/fapiPlatHwAccess.C $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2011 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END_TAG /** * @file fapiPlatHwAccess.C * @@ -575,7 +554,7 @@ fapi::ReturnCode platModifyCfamRegister(const fapi::Target& i_target, // platGetRing function, the platform implementation //****************************************************************************** fapi::ReturnCode platGetRing(const fapi::Target& i_target, - const uint32_t i_address, + const scanRingId_t i_address, ecmdDataBufferBase & o_data, const uint32_t i_ringMode) { @@ -609,7 +588,7 @@ fapi::ReturnCode platGetRing(const fapi::Target& i_target, // platPutRing function //****************************************************************************** fapi::ReturnCode platPutRing(const fapi::Target& i_target, - const uint32_t i_address, + const scanRingId_t i_address, ecmdDataBufferBase & i_data, const uint32_t i_ringMode) { @@ -644,7 +623,7 @@ fapi::ReturnCode platPutRing(const fapi::Target& i_target, // platModifyRing function //****************************************************************************** fapi::ReturnCode platModifyRing(const fapi::Target& i_target, - const uint32_t i_address, + const scanRingId_t i_address, ecmdDataBufferBase & i_data, const fapi::ChipOpModifyMode i_modifyMode, const uint32_t i_ringMode) |