diff options
Diffstat (limited to 'src/hwpf/src')
| -rw-r--r-- | src/hwpf/src/plat/plat_attribute_service.H | 9 | ||||
| -rw-r--r-- | src/hwpf/src/plat/target.C | 23 |
2 files changed, 16 insertions, 16 deletions
diff --git a/src/hwpf/src/plat/plat_attribute_service.H b/src/hwpf/src/plat/plat_attribute_service.H index 9e2a26a2..2decbed4 100644 --- a/src/hwpf/src/plat/plat_attribute_service.H +++ b/src/hwpf/src/plat/plat_attribute_service.H @@ -6,6 +6,7 @@ /* OpenPOWER sbe Project */ /* */ /* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* [+] International Business Machines Corp. */ /* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ @@ -56,12 +57,12 @@ /* global get uint8_t 1D array macro */ #define PLAT_ATTR_GET_UINT8_1D_ARRAY(ID, PTARGET, VAL) \ - _getAttributeArrayShort<ID##_Type, static_cast<fapi2::TargetType>(ID##_TargetTypes), ID> \ + _getAttributeArrayShort<ID##_Type, static_cast<fapi2::TargetType>(ID##TargetType), ID> \ (ID, PTARGET, VAL) /* global set uint8_t 1D array macro */ #define PLAT_ATTR_SET_UINT8_1D_ARRAY(ID, PTARGET, VAL) \ - _setAttributeArrayShort<ID##_Type, static_cast<fapi2::TargetType>(ID##_TargetTypes), ID> \ + _setAttributeArrayShort<ID##_Type, static_cast<fapi2::TargetType>(ID##TargetType), ID> \ (ID, PTARGET, VAL) /* global get uint8_t 2D array macro */ @@ -144,12 +145,12 @@ /* global get int macro (uint8_t, 16, 32 and 64) */ #define PLAT_ATTR_GET_GLOBAL_INT(ID, PTARGET, VAL) \ - _get<ID##_Type, static_cast<fapi2::TargetType>(ID##_TargetTypes), ID> \ + _get<ID##_Type, static_cast<fapi2::TargetType>(ID##_TargetType), ID> \ (ID, PTARGET, VAL) /* global set int macro (uint8_t, 16, 32 and 64) */ #define PLAT_ATTR_SET_GLOBAL_INT(ID, PTARGET, VAL) \ - _set<ID##_Type, static_cast<fapi2::TargetType>(ID##_TargetTypes), ID> \ + _set<ID##_Type, static_cast<fapi2::TargetType>(ID##_TargetType), ID> \ (ID, PTARGET, VAL) diff --git a/src/hwpf/src/plat/target.C b/src/hwpf/src/plat/target.C index 9600140a..4249c6ec 100644 --- a/src/hwpf/src/plat/target.C +++ b/src/hwpf/src/plat/target.C @@ -318,18 +318,17 @@ namespace fapi2 if (b_present) { - i_chiplet_target.setPresent(); - i_chiplet_target.setFunctional(true); + static_cast<plat_target_handle_t&>((i_chiplet_target.operator()())).setPresent(); + static_cast<plat_target_handle_t&>((i_chiplet_target.operator()())).setFunctional(true); } else { - FAPI_DBG("Perv target NOT present (nor functional): chiplet_number = %d", - i_chiplet_target.getChipletNumber()); + FAPI_DBG("Perv target NOT present (nor functional): chiplet_number = %d", i_chiplet_target.getChipletNumber()); } FAPI_DBG("Target present = %u, Target functional = %u", - i_chiplet_target.getPresent(), - i_chiplet_target.getFunctional()); + static_cast<plat_target_handle_t>(i_chiplet_target.get()).getPresent(), + static_cast<plat_target_handle_t>(i_chiplet_target.get()).getFunctional()); fapi_try_exit: return fapi2::current_err; @@ -490,8 +489,8 @@ fapi_try_exit: if(0 == l_eqAttrPg) { - target_name.setPresent(); - target_name.setFunctional(true); + static_cast<plat_target_handle_t&>(target_name.operator ()()).setPresent(); + static_cast<plat_target_handle_t&>(target_name.operator ()()).setFunctional(true); } G_vec_targets.at(l_beginning_offset+i) = revle32((fapi2::plat_target_handle_t)(target_name.get())); } @@ -525,8 +524,8 @@ fapi_try_exit: if(0 == l_attrPg) { - target_name.setPresent(); - target_name.setFunctional(true); + static_cast<plat_target_handle_t&>(target_name.operator ()()).setPresent(); + static_cast<plat_target_handle_t&>(target_name.operator ()()).setFunctional(true); } G_vec_targets.at(l_beginning_offset+i) = revle32((fapi2::plat_target_handle_t)(target_name.get())); @@ -572,7 +571,7 @@ fapi_try_exit: FAPI_DBG("Making %d'th EQ non-functional", l_idx); // EQ chiplet l_idx is to be marked non-functional fapi2::Target<fapi2::TARGET_TYPE_EQ> l_target = G_vec_targets.at(l_idx + EQ_TARGET_OFFSET); - l_target.setFunctional(false); + static_cast<plat_target_handle_t&>(l_target.operator ()()).setFunctional(false); G_vec_targets.at(l_idx + EQ_TARGET_OFFSET) = l_target.get(); } } @@ -584,7 +583,7 @@ fapi_try_exit: FAPI_DBG("Making %d'th EC non-functional", l_idx); // EC chiplet l_idx is to be marked non-functional fapi2::Target<fapi2::TARGET_TYPE_CORE> l_target = G_vec_targets.at(l_idx + CORE_TARGET_OFFSET); - l_target.setFunctional(false); + static_cast<plat_target_handle_t&>(l_target.operator ()()).setFunctional(false); G_vec_targets.at(l_idx + CORE_TARGET_OFFSET) = l_target.get(); } else |
