diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/usr/hwpf/hwp/fapiHwpExecInitFile.H | 7 | ||||
| -rw-r--r-- | src/include/usr/hwpf/hwp/fapiHwpInitFileInclude.H | 17 | ||||
| -rw-r--r-- | src/include/usr/hwpf/hwp/fapiTestHwp.H | 9 |
3 files changed, 19 insertions, 14 deletions
diff --git a/src/include/usr/hwpf/hwp/fapiHwpExecInitFile.H b/src/include/usr/hwpf/hwp/fapiHwpExecInitFile.H index 63b1dc218..8ffba1cc8 100644 --- a/src/include/usr/hwpf/hwp/fapiHwpExecInitFile.H +++ b/src/include/usr/hwpf/hwp/fapiHwpExecInitFile.H @@ -33,6 +33,7 @@ * camvanng 09/29/2011 Created. * andrewg 11/16/2011 Refactor includes with initfile compiler * camvanng 11/16/2011 Define function pointer to HWP + * camvanng 05/07/2012 Support for associated target attributes * */ @@ -49,17 +50,17 @@ extern "C" //Provided for platforms that need to cast a generic function pointer into a //function pointer of the correct type to call the HWP. -typedef fapi::ReturnCode (*fapiHwpExecInitFile_FP_t)(const fapi::Target & i_Target, +typedef fapi::ReturnCode (*fapiHwpExecInitFile_FP_t)(const std::vector<fapi::Target> & i_target, const char * i_file); /** * @brief HWP to execute an initfile. * -* @param[in] i_chip Reference to target chip +* @param[in] i_target Reference to std::vector of targets * @param[in] i_file filename of binary initfile * * @return ReturnCode */ -fapi::ReturnCode fapiHwpExecInitFile(const fapi::Target & i_Target, +fapi::ReturnCode fapiHwpExecInitFile(const std::vector<fapi::Target> & i_target, const char * i_file); } // extern "C" diff --git a/src/include/usr/hwpf/hwp/fapiHwpInitFileInclude.H b/src/include/usr/hwpf/hwp/fapiHwpInitFileInclude.H index 50f2bd222..e726c59bb 100644 --- a/src/include/usr/hwpf/hwp/fapiHwpInitFileInclude.H +++ b/src/include/usr/hwpf/hwp/fapiHwpInitFileInclude.H @@ -33,6 +33,8 @@ * andrewg 11/09/2011 Created. * camvanng 11/16/2011 Support for system & target * attributes + * camvanng 05/07/2012 Support for associated + * target attributes * */ @@ -73,16 +75,15 @@ enum IfRpnOp */ enum IfTypeMask { - IF_ATTR_TYPE = 0x8000, - IF_NUM_TYPE = 0xC000, - IF_TYPE_MASK = 0xC000, + IF_NUM_TYPE = 0x4000, + IF_ATTR_TYPE = 0x8000, + IF_SYS_ATTR_TYPE = 0xA000, + IF_ASSOC_TGT_ATTR_TYPE = 0xC000, + IF_TYPE_MASK = 0xE000, }; -// System or Target attribute -const uint16_t IF_SYS_ATTR_MASK = 0x2000; - -// Attribute Id mask -const uint16_t IF_ATTR_ID_MASK = 0x1FFF; +// Id mask +const uint16_t IF_ID_MASK = static_cast<uint16_t>(~IF_TYPE_MASK); // Only support up to 4 dimensions for an array const uint8_t MAX_ATTRIBUTE_ARRAY_DIMENSION = 4; diff --git a/src/include/usr/hwpf/hwp/fapiTestHwp.H b/src/include/usr/hwpf/hwp/fapiTestHwp.H index 12349e737..d1451d493 100644 --- a/src/include/usr/hwpf/hwp/fapiTestHwp.H +++ b/src/include/usr/hwpf/hwp/fapiTestHwp.H @@ -34,14 +34,17 @@ * mjjones 06/28/2011 Updated comment * mjjones 08/11/2011 Removed Clock HWP * mjjones 10/17/2011 Added func pointer + * camvanng 05/07/2012 Support for associated + * attributes */ #ifndef FAPITESTHW_H_ #define FAPITESTHW_H_ #include <fapi.H> +#include <vector> -typedef fapi::ReturnCode (*hwpInitialTest_FP_t)(const fapi::Target &); +typedef fapi::ReturnCode (*hwpInitialTest_FP_t)(const std::vector<fapi::Target> &); extern "C" { @@ -49,11 +52,11 @@ extern "C" /** * @brief A simple HWP. Can easily be modified by HW dev team for test * - * @param[in] i_chip Reference to target chip + * @param[in] i_target Reference to std::vector of targets * * @return ReturnCode */ -fapi::ReturnCode hwpInitialTest(const fapi::Target & i_chip); +fapi::ReturnCode hwpInitialTest(const std::vector<fapi::Target> & i_target); } |
