diff options
| author | vanlee <vanlee@us.ibm.com> | 2013-05-20 11:23:20 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2013-06-03 11:09:17 -0500 |
| commit | 6a088d797ad9bec90aaf534847fcf05abe26673d (patch) | |
| tree | 17ba179835e445478522ad96b41b02ab217bcb70 /src/usr/hwpf/hwp | |
| parent | 2a412fd6822c13468ac715f20f539153dcba8bfc (diff) | |
| download | talos-hostboot-6a088d797ad9bec90aaf534847fcf05abe26673d.tar.gz talos-hostboot-6a088d797ad9bec90aaf534847fcf05abe26673d.zip | |
Fixing BEAM errors
pbusLinkSvc.C nest_chiplets.C TodProc.C TodSvcUtil.C
Change-Id: I680468745b316fa87fbc31615aab034ae3eb9d0a
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/4598
Tested-by: Jenkins Server
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Reviewed-by: Mark W. Wenning <wenning@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/hwpf/hwp')
| -rw-r--r-- | src/usr/hwpf/hwp/bus_training/pbusLinkSvc.C | 7 | ||||
| -rw-r--r-- | src/usr/hwpf/hwp/nest_chiplets/nest_chiplets.C | 2 | ||||
| -rwxr-xr-x | src/usr/hwpf/hwp/tod_init/TodProc.C | 1 | ||||
| -rwxr-xr-x | src/usr/hwpf/hwp/tod_init/TodSvcUtil.C | 7 |
4 files changed, 9 insertions, 8 deletions
diff --git a/src/usr/hwpf/hwp/bus_training/pbusLinkSvc.C b/src/usr/hwpf/hwp/bus_training/pbusLinkSvc.C index 307dc8a40..5b47d7792 100644 --- a/src/usr/hwpf/hwp/bus_training/pbusLinkSvc.C +++ b/src/usr/hwpf/hwp/bus_training/pbusLinkSvc.C @@ -78,8 +78,11 @@ errlHndl_t PbusLinkSvc::getPbusConnections( TargetPairs_t & o_PbusConnections, } } - o_PbusConnections.insert( (*l_PbusConnections).begin(), - (*l_PbusConnections).end() ); + if (l_errl == NULL) + { + o_PbusConnections.insert( (*l_PbusConnections).begin(), + (*l_PbusConnections).end() ); + } mutex_unlock(&iv_mutex); diff --git a/src/usr/hwpf/hwp/nest_chiplets/nest_chiplets.C b/src/usr/hwpf/hwp/nest_chiplets/nest_chiplets.C index 91824b288..5f0f338b9 100644 --- a/src/usr/hwpf/hwp/nest_chiplets/nest_chiplets.C +++ b/src/usr/hwpf/hwp/nest_chiplets/nest_chiplets.C @@ -310,7 +310,7 @@ errlHndl_t customizeChipRegions(TARGETING::Target* i_procTarget) //prepare the vector to be populated to ATTR_CHIP_REGIONS_TO_ENABLE TARGETING::ATTR_CHIP_REGIONS_TO_ENABLE_type l_chipRegionData; - memset(l_chipRegionData,sizeof(ATTR_CHIP_REGIONS_TO_ENABLE_type),0); + memset(&l_chipRegionData,0,sizeof(ATTR_CHIP_REGIONS_TO_ENABLE_type)); //Skip the header uint16_t *l_partialGoodUint16=reinterpret_cast<uint16_t*>( diff --git a/src/usr/hwpf/hwp/tod_init/TodProc.C b/src/usr/hwpf/hwp/tod_init/TodProc.C index 890f0b2cd..73c8082cc 100755 --- a/src/usr/hwpf/hwp/tod_init/TodProc.C +++ b/src/usr/hwpf/hwp/tod_init/TodProc.C @@ -404,6 +404,7 @@ errlHndl_t TodProc::getBusPort( break; case 2: o_busPort = ABUS2; + break; default: TOD_ERR("Port 0x%.8X not supported for A bus", i_busPort); diff --git a/src/usr/hwpf/hwp/tod_init/TodSvcUtil.C b/src/usr/hwpf/hwp/tod_init/TodSvcUtil.C index 4c5c5da2c..ebcb40289 100755 --- a/src/usr/hwpf/hwp/tod_init/TodSvcUtil.C +++ b/src/usr/hwpf/hwp/tod_init/TodSvcUtil.C @@ -192,11 +192,8 @@ errlHndl_t getFuncNodeTargetsOnSystem(const TARGETING::Target* break; } - TARGETING::ATTR_CLASS_type l_class= - i_pInputTarget->getAttr<TARGETING::ATTR_CLASS>(); - - TARGETING::ATTR_TYPE_type l_type= - i_pInputTarget->getAttr<TARGETING::ATTR_TYPE>(); + CLASS l_class = i_pInputTarget->getAttr<ATTR_CLASS>(); + TYPE l_type = i_pInputTarget->getAttr<ATTR_TYPE>(); if((TARGETING::CLASS_SYS == l_class) && (TARGETING::TYPE_SYS == l_type))//System target |
