From d83daa515aba95f7c756fe3406d79076cc6f57cd Mon Sep 17 00:00:00 2001 From: Bill Schwartz Date: Thu, 25 Jul 2013 06:36:25 -0500 Subject: VPD Accessor functions for Slope/Intercept - big endian little -> big endian interpretation of cvpd. Requested and verified by Mark Bellows. Also update recent hwp accessor $IDs to be in sync with eKB Change-Id: I7f802332b070319d327c869a955a2c2999e1ca88 RTC: 67125 Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/5563 Tested-by: Jenkins Server Reviewed-by: Brian H. Horton Reviewed-by: Donald E. Dahle Reviewed-by: A. Patrick Williams III --- .../hwp/mvpd_accessors/getMBvpdAddrMirrorData.C | 2 +- .../hwp/mvpd_accessors/getMBvpdPhaseRotatorData.C | 2 +- .../mvpd_accessors/getMBvpdSlopeInterceptData.C | 34 +++++++++++----------- src/usr/hwpf/hwp/mvpd_accessors/getMBvpdTermData.C | 2 +- src/usr/hwpf/hwp/mvpd_accessors/mvpd_errors.xml | 2 +- src/usr/hwpf/hwp/mvpd_accessors/setMvpdRing.H | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) (limited to 'src/usr/hwpf') diff --git a/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdAddrMirrorData.C b/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdAddrMirrorData.C index cc76bf84f..0c46c0bca 100644 --- a/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdAddrMirrorData.C +++ b/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdAddrMirrorData.C @@ -20,7 +20,7 @@ /* Origin: 30 */ /* */ /* IBM_PROLOG_END_TAG */ -// $Id$ +// $Id: getMBvpdAddrMirrorData.C,v 1.2 2013/07/18 15:33:35 whs Exp $ /** * @file getMBvpdAddrMirrorData.C * diff --git a/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdPhaseRotatorData.C b/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdPhaseRotatorData.C index 4f44536c7..7df854c2f 100644 --- a/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdPhaseRotatorData.C +++ b/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdPhaseRotatorData.C @@ -20,7 +20,7 @@ /* Origin: 30 */ /* */ /* IBM_PROLOG_END_TAG */ -// $Id: getMBvpdPhaseRotatorData.C,v 1.3 2013/05/28 10:52:53 whs Exp $ +// $Id: getMBvpdPhaseRotatorData.C,v 1.4 2013/06/12 21:12:49 whs Exp $ /** * @file getMBvpdPhaseRotatorData.C * diff --git a/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdSlopeInterceptData.C b/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdSlopeInterceptData.C index 2936e5854..5693581e2 100644 --- a/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdSlopeInterceptData.C +++ b/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdSlopeInterceptData.C @@ -20,7 +20,7 @@ /* Origin: 30 */ /* */ /* IBM_PROLOG_END_TAG */ -// $Id$ +// $Id: getMBvpdSlopeInterceptData.C,v 1.2 2013/07/19 18:41:09 whs Exp $ /** * @file getMBvpdSlopeInterceptData.C * @@ -109,10 +109,10 @@ fapi::ReturnCode getMBvpdMasterData( struct mw_keyword { uint8_t MWKeywordVersion; - uint8_t masterPowerSlope_LSB; //little endian order - uint8_t masterPowerSlope_MSB; - uint8_t masterPowerIntercept_LSB; //little endian order - uint8_t masterPowerIntercept_MSB; + uint8_t masterPowerSlope_MSB; //big endian order + uint8_t masterPowerSlope_LSB; + uint8_t masterPowerIntercept_MSB; //big endian order + uint8_t masterPowerIntercept_LSB; uint8_t reserved[4]; uint8_t tempSensorPrimaryLayout; uint8_t tempSensorSecondaryLayout; @@ -155,11 +155,11 @@ fapi::ReturnCode getMBvpdMasterData( // Return requested value switch (i_attr) { - case MASTER_POWER_SLOPE: //convert from little endian order + case MASTER_POWER_SLOPE: //get each byte to perserve endian o_val = l_pMwBuffer->masterPowerSlope_LSB; o_val |= (l_pMwBuffer->masterPowerSlope_MSB << 8); break; - case MASTER_POWER_INTERCEPT: //convert from little endian order + case MASTER_POWER_INTERCEPT: //get each byte to perserve endian o_val = l_pMwBuffer->masterPowerIntercept_LSB; o_val |= (l_pMwBuffer->masterPowerIntercept_MSB << 8); break; @@ -195,20 +195,20 @@ fapi::ReturnCode getMBvpdSupplierData( struct pdI_keyword { uint8_t filler1[117]; // other fields and reserved bytes - uint8_t moduleID_LSB; // at offset 117. Little endian order - uint8_t moduleID_MSB; // VPD data CCIN_31E1_v.5.3.ods + uint8_t moduleID_MSB; // at offset 117. Big endian order + uint8_t moduleID_LSB; // VPD data CCIN_31E1_v.5.3.ods uint8_t filler2[PDI_KEYWORD_SIZE-117-2]; // trailing space }; //MV keyword layout struct mv_vendorInfo { - uint8_t supplierID_LSB; // little endian order - uint8_t supplierID_MSB; - uint8_t supplierPowerSlope_LSB; // little endian order - uint8_t supplierPowerSlope_MSB; - uint8_t supplierPowerIntercept_LSB; // little endian order - uint8_t supplierPowerIntercept_MSB; + uint8_t supplierID_MSB; // Big endian order + uint8_t supplierID_LSB; + uint8_t supplierPowerSlope_MSB; // Big endian order + uint8_t supplierPowerSlope_LSB; + uint8_t supplierPowerIntercept_MSB; // Big endian order + uint8_t supplierPowerIntercept_LSB; uint8_t reserved[4]; }; struct mv_keyword //variable length @@ -334,11 +334,11 @@ fapi::ReturnCode getMBvpdSupplierData( { switch (i_attr) { - case SUPPLIER_POWER_SLOPE: //convert from little endian order + case SUPPLIER_POWER_SLOPE: //get each byte to perserve endian o_val = l_pVendorInfo->supplierPowerSlope_LSB; o_val |= (l_pVendorInfo->supplierPowerSlope_MSB << 8); break; - case SUPPLIER_POWER_INTERCEPT: //convert from little endian order + case SUPPLIER_POWER_INTERCEPT: //get each byte to perserve endian o_val = l_pVendorInfo->supplierPowerIntercept_LSB; o_val |= (l_pVendorInfo->supplierPowerIntercept_MSB << 8); break; diff --git a/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdTermData.C b/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdTermData.C index eaaf1339e..7723d38cf 100644 --- a/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdTermData.C +++ b/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdTermData.C @@ -20,7 +20,7 @@ /* Origin: 30 */ /* */ /* IBM_PROLOG_END_TAG */ -// $Id: getMBvpdTermData.C,v 1.1 2013/05/28 11:17:23 whs Exp $ +// $Id: getMBvpdTermData.C,v 1.2 2013/06/13 13:48:46 whs Exp $ /** * @file getMBvpdTermData.C * diff --git a/src/usr/hwpf/hwp/mvpd_accessors/mvpd_errors.xml b/src/usr/hwpf/hwp/mvpd_accessors/mvpd_errors.xml index b2d984b27..711b8dbbe 100644 --- a/src/usr/hwpf/hwp/mvpd_accessors/mvpd_errors.xml +++ b/src/usr/hwpf/hwp/mvpd_accessors/mvpd_errors.xml @@ -20,7 +20,7 @@ - + diff --git a/src/usr/hwpf/hwp/mvpd_accessors/setMvpdRing.H b/src/usr/hwpf/hwp/mvpd_accessors/setMvpdRing.H index 814c01f0a..0b9c66719 100644 --- a/src/usr/hwpf/hwp/mvpd_accessors/setMvpdRing.H +++ b/src/usr/hwpf/hwp/mvpd_accessors/setMvpdRing.H @@ -20,7 +20,7 @@ /* Origin: 30 */ /* */ /* IBM_PROLOG_END_TAG */ -// $Id: RepairRingFunc.H,v 1.1 2012/07/19 22:00:38 mjjones Exp $ +// $Id: setMvpdRing.H,v 1.2 2013/01/25 21:12:40 whs Exp $ /** * @file setMvpdRing.H * -- cgit v1.2.3