diff options
4 files changed, 28 insertions, 22 deletions
diff --git a/src/usr/hwpf/hwp/bus_training/erepairGetFailedLanesHwp.C b/src/usr/hwpf/hwp/bus_training/erepairGetFailedLanesHwp.C index 00302e06d..135b302c3 100644 --- a/src/usr/hwpf/hwp/bus_training/erepairGetFailedLanesHwp.C +++ b/src/usr/hwpf/hwp/bus_training/erepairGetFailedLanesHwp.C @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2013,2014 */ +/* Contributors Listed Below - COPYRIGHT 2013,2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -20,7 +22,7 @@ /* permissions and limitations under the License. */ /* */ /* IBM_PROLOG_END_TAG */ -// $Id: erepairGetFailedLanesHwp.C,v 1.3 2014/04/29 11:59:48 bilicon Exp $ +// $Id: erepairGetFailedLanesHwp.C,v 1.4 2014/08/05 15:04:38 kahnevan Exp $ /** * @file erepairGetFailedLanesHwp.C * @@ -522,7 +524,7 @@ fapi::ReturnCode determineRepairLanes(const fapi::Target &i_tgtHandle, }while(0); - FAPI_INF("<< No.of Fail Lanes: tx: %d, rx: %d", + FAPI_INF("<< No.of Fail Lanes: tx: %zd, rx: %zd", o_txFailLanes.size(), o_rxFailLanes.size()); return(l_rc); diff --git a/src/usr/hwpf/hwp/fapiHwpExecInitFile.C b/src/usr/hwpf/hwp/fapiHwpExecInitFile.C index 1bb1bb507..f1b61b26e 100644 --- a/src/usr/hwpf/hwp/fapiHwpExecInitFile.C +++ b/src/usr/hwpf/hwp/fapiHwpExecInitFile.C @@ -1,7 +1,7 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/hwpf/hwp/fapiHwpExecInitFile.C $ */ +/* $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/hwpf/working/hwp/fapiHwpExecInitFile.C,v $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ @@ -27,7 +27,7 @@ * * @brief Implements a Hardware Procedure to execute an initfile. */ -// $Id: fapiHwpExecInitFile.C,v 1.21 2014/06/30 16:48:42 thi Exp $ +// $Id: fapiHwpExecInitFile.C,v 1.22 2014/08/05 15:04:40 kahnevan Exp $ /* * Change Log ****************************************************************** * Flag Defect/Feature User Date Description @@ -547,7 +547,7 @@ void InitFileStats::dump() { iv_ok = false; - FAPI_IMP( "dump stats: initfile %s version %u, addr=%p, size = %u", + FAPI_IMP( "dump stats: initfile %s version %u, addr=%p, size = %zu", iv_pInitFileName, iv_initFileVersion, iv_pInitFileAddr, @@ -653,7 +653,7 @@ fapi::ReturnCode fapiHwpExecInitFile(const std::vector<fapi::Target> & i_target, if (l_rc.ok()) { - FAPI_IMP( "fapiHwpExecInitFile: initfile addr = %p, size = %u", + FAPI_IMP( "fapiHwpExecInitFile: initfile addr = %p, size = %zu", l_ifAddr, l_ifSize ); @@ -813,7 +813,7 @@ void ifSeek(ifInfo_t & io_ifInfo, size_t i_offset) { if (i_offset > io_ifInfo.size) { - FAPI_ERR("fapiHwpExecInitFile: ifSeek: offset out of range 0x%X", + FAPI_ERR("fapiHwpExecInitFile: ifSeek: offset out of range 0x%zX", i_offset ); fapiAssert(false); } @@ -844,7 +844,7 @@ void ifRead(ifInfo_t & io_ifInfo, void * o_data, uint32_t i_size, bool i_swap) if ((io_ifInfo.offset + i_size) > io_ifInfo.size) { - FAPI_ERR( "fapiHwpExecInitFile: ifRead: offset 0x%X + size 0x%X " + FAPI_ERR( "fapiHwpExecInitFile: ifRead: offset 0x%zX + size 0x%X " "out of range", io_ifInfo.offset, i_size ); @@ -1015,7 +1015,7 @@ fapi::ReturnCode getAttr(const ifData_t & i_ifData, { FAPI_ERR( "fapiHwpExecInitFile: " "getAttr: target# %u is greater " - "than number of targets %u passed in", + "than number of targets %zu passed in", i_targetNum, i_ifData.pTarget->size() ); @@ -1434,14 +1434,16 @@ void loadScomSection(ifInfo_t & io_ifInfo, //Is this an associated target attribute if ((l_colId & IF_TYPE_MASK) == IF_ASSOC_TGT_ATTR_TYPE) { - uint16_t l_colTgtId = 0; //Read the target Id //Don't swap the bytes - it is parsed by bytes later in code. ifRead(io_ifInfo, l_pCol, sizeof(uint16_t), false); - l_colTgtId = (*l_pCol << 8) | (*(l_pCol+1)); - IF_DBG2( "loadScomSection: colTgtId[%u] 0x%02x", - j, - l_colTgtId ); + #ifdef HWPEXECINITFILE_DEBUG2 + uint16_t l_colTgtId = 0; + l_colTgtId = (*l_pCol << 8) | (*(l_pCol+1)); + IF_DBG2( "loadScomSection: colTgtId[%u] 0x%02x", + j, + l_colTgtId ); + #endif } l_pCol += 2; //advance past the target Id } @@ -1981,7 +1983,7 @@ fapi::ReturnCode executeScoms(ifData_t & i_ifData, InitFileStats &i_stats ) // loop early due to an error (l_rc != 0). if (l_scomList.size()) { - FAPI_ERR( "fapiHwpExecInitFile: executeScoms: scom list size = %u, " + FAPI_ERR( "fapiHwpExecInitFile: executeScoms: scom list size = %zu, " "expecting zero", l_scomList.size() ); l_scomList.clear(); @@ -2327,7 +2329,7 @@ void rpnDumpStack(rpnStack_t * i_rpnStack) if ( i_rpnStack != NULL ) { - FAPI_IMP( ">> fapiHwpExecInitFile: rpnDumpStack: %p, stack size = %d", + FAPI_IMP( ">> fapiHwpExecInitFile: rpnDumpStack: %p, stack size = %zd", i_rpnStack, i_rpnStack->size() ); diff --git a/src/usr/hwpf/hwp/mvpd_accessors/accessMBvpdL4BankDelete.C b/src/usr/hwpf/hwp/mvpd_accessors/accessMBvpdL4BankDelete.C index fe96ec05b..bf9767cc7 100644 --- a/src/usr/hwpf/hwp/mvpd_accessors/accessMBvpdL4BankDelete.C +++ b/src/usr/hwpf/hwp/mvpd_accessors/accessMBvpdL4BankDelete.C @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2013,2014 */ +/* Contributors Listed Below - COPYRIGHT 2013,2014 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -20,7 +22,7 @@ /* permissions and limitations under the License. */ /* */ /* IBM_PROLOG_END_TAG */ -// $Id: accessMBvpdL4BankDelete.C,v 1.3 2014/02/12 22:11:26 mjjones Exp $ +// $Id: accessMBvpdL4BankDelete.C,v 1.4 2014/08/05 15:04:51 kahnevan Exp $ /** * @file accessMBvpdL4BankDelete.C * @@ -70,7 +72,7 @@ fapi::ReturnCode accessMBvpdL4BankDelete( if (l_bufSize < sizeof(l_l4BankDelete) ) { FAPI_ERR("accessMBvpdL4BankDelete:" - " less keyword data returned than expected %d < %d", + " less keyword data returned than expected %d < %zd", l_bufSize, sizeof(l_l4BankDelete)); const uint32_t & KEYWORD = sizeof(l_l4BankDelete); const uint32_t & RETURNED_SIZE = l_bufSize; diff --git a/src/usr/hwpf/hwp/spd_accessors/getSpdAttrAccessor.C b/src/usr/hwpf/hwp/spd_accessors/getSpdAttrAccessor.C index d351e7e10..998941e2e 100644 --- a/src/usr/hwpf/hwp/spd_accessors/getSpdAttrAccessor.C +++ b/src/usr/hwpf/hwp/spd_accessors/getSpdAttrAccessor.C @@ -22,7 +22,7 @@ /* permissions and limitations under the License. */ /* */ /* IBM_PROLOG_END_TAG */ -// $Id: getSpdAttrAccessor.C,v 1.2 2014/06/27 19:46:27 thi Exp $ +// $Id: getSpdAttrAccessor.C,v 1.3 2014/08/05 15:04:52 kahnevan Exp $ /** * @file getSpdAttrAccessor.C * @@ -66,7 +66,7 @@ fapi::ReturnCode checkSize(const fapi::getSpdAttr::Attr i_attr, if (i_actualSize != i_expectedSize) { - FAPI_ERR("getSpdAttrAccessor: Incorrect Attribute output buffer size %d:%d:%d", + FAPI_ERR("getSpdAttrAccessor: Incorrect Attribute output buffer size %d:%zd:%zd", i_attr, i_actualSize, i_expectedSize); const fapi::getSpdAttr::Attr & ATTR_ID = i_attr; const size_t & ACTUAL_SIZE = i_actualSize; |