From b27f3afb24e832217c5bffccd57fe8c9cc76a081 Mon Sep 17 00:00:00 2001 From: Bill Schwartz Date: Fri, 7 Feb 2014 17:54:33 -0600 Subject: =?UTF-8?q?ATTR=5FVPD=5FCKE=5FPWR=5FMAP=20uint32=5Ft=C2=A0[2]=20to?= =?UTF-8?q?=20uint64=5Ft?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Attribute ATTR_VPD_CKE_PWR_MAP has changed from uint32_t [2] to uint64_t. Update HWP Accessor getMBvpdTermData to match return type. Change-Id: I7191a495b23fac6897639c36a706f030046bbf6c RTC: 97264 Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/8697 Reviewed-by: Thi N. Tran Reviewed-by: MIKE J. JONES Tested-by: Jenkins Server Reviewed-by: Brian H. Horton Reviewed-by: A. Patrick Williams III --- src/usr/hwpf/hwp/mvpd_accessors/getMBvpdTermData.C | 27 +++++++++++++--------- src/usr/hwpf/test/hwpMBvpdAccessorTest.H | 26 ++++++++++----------- 2 files changed, 28 insertions(+), 25 deletions(-) (limited to 'src/usr/hwpf') diff --git a/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdTermData.C b/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdTermData.C index 365986955..c5e612eab 100644 --- a/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdTermData.C +++ b/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdTermData.C @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2013 */ +/* COPYRIGHT International Business Machines Corp. 2012,2014 */ /* */ /* p1 */ /* */ @@ -20,7 +20,7 @@ /* Origin: 30 */ /* */ /* IBM_PROLOG_END_TAG */ -// $Id: getMBvpdTermData.C,v 1.6 2013/10/31 18:03:28 whs Exp $ +// $Id: getMBvpdTermData.C,v 1.8 2014/02/10 19:57:04 whs Exp $ /** * @file getMBvpdTermData.C * @@ -457,18 +457,23 @@ fapi::ReturnCode getMBvpdTermData( } break; } - // return the uint16_t [2] attributes from the MT keyword buffer - // return the uint32_t [2] attributes from the MT keyword buffer + // return the uint64_t attributes from the MT keyword buffer // need to consider endian since they are word fields case TERM_DATA_CKE_PWR_MAP: { - uint32_t (* l_pVal)[2] = (uint32_t (*)[2])o_pVal; - for (uint8_t l_port=0; l_port<2;l_port++) - { - uint32_t * l_pWord = (uint32_t *)&l_pMtBuffer-> - mb_mba[l_pos].mba_port[l_port].port_attr[l_attrOffset]; - (*l_pVal)[l_port] = FAPI_BE32TOH(*l_pWord); - } + uint64_t (* l_pVal) = (uint64_t (*))o_pVal; + + uint32_t * l_pWord = (uint32_t *)&l_pMtBuffer-> + mb_mba[l_pos].mba_port[0].port_attr[l_attrOffset]; + uint32_t l_port0 = FAPI_BE32TOH(*l_pWord); + + l_pWord = (uint32_t *)&l_pMtBuffer-> + mb_mba[l_pos].mba_port[1].port_attr[l_attrOffset]; + uint32_t l_port1 = FAPI_BE32TOH(*l_pWord); + + (*l_pVal) = ( ((static_cast(l_port0))<<32) | + (static_cast(l_port1)) ); + break; } // return the uint16_t [2] attributes from the MT keyword buffer diff --git a/src/usr/hwpf/test/hwpMBvpdAccessorTest.H b/src/usr/hwpf/test/hwpMBvpdAccessorTest.H index eb0d54f64..a5b2f636f 100644 --- a/src/usr/hwpf/test/hwpMBvpdAccessorTest.H +++ b/src/usr/hwpf/test/hwpMBvpdAccessorTest.H @@ -1,11 +1,11 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/hwpf/test/hwpmbvpdaccessortest.H $ */ +/* $Source: src/usr/hwpf/test/hwpMBvpdAccessorTest.H $ */ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2013 */ +/* COPYRIGHT International Business Machines Corp. 2012,2014 */ /* */ /* p1 */ /* */ @@ -773,22 +773,21 @@ public: { fapi::ReturnCode l_fapirc; uint8_t val1[2][2] = {{0xFF,0xFF},{0xFF,0xFF}}; -#if HWPMBVPDACCESSORTEST_UT0 +#if HWPMBVPDACCESSORTEST_UT4 uint8_t val2[2][2][4]={ {{0xFF,0xFF,0xFF,0xFF},{0xFF,0xFF,0xFF,0xFF}}, {{0xFF,0xFF,0xFF,0xFF},{0xFF,0xFF,0xFF,0xFF}}}; uint8_t l_errorChk = 1; //do error checks just once uint8_t val4[2] = {0xFF,0xFF}; -#endif uint32_t val3[2] = {0xFFFFFFFF,0xFFFFFFFF}; -#if HWPMBVPDACCESSORTEST_UT4 uint8_t val5[2] = {0xFF,0xFF}; #endif -#if HWPMBVPDACCESSORTEST_UT0 + uint64_t val6 = 0xFFFFFFFFFFFFFFFF; + +#if HWPMBVPDACCESSORTEST_UT4 getMBvpdTermData_FP_t (l_getMBvpdTermData) = &getMBvpdTermData; #endif - TS_TRACE( "testGetTermData entry" ); TARGETING::TargetHandleList l_memBufList; @@ -1069,7 +1068,7 @@ public: TS_TRACE( "testGetTermData attr " "TERM_DATA_CEN_SLEW_RATE_SPCKE=0x%02x,0x%02x", val4[0], val4[1]); -#endif + // TERM_DATA_CKE_PRI_MAP val3[0] = 0xFFFFFFFF; val3[1] = 0xFFFFFFFF; @@ -1079,18 +1078,17 @@ public: TS_TRACE( "testGetTermData attr " "TERM_DATA_CKE_PRI_MAP=0x%08x,0x%08x", val3[0], val3[1]); +#endif -#if HWPMBVPDACCESSORTEST_UT4 // TERM_DATA_CKE_PWR_MAP - val3[0] = 0xFFFFFFFF; - val3[1] = 0xFFFFFFFF; + val6 = 0xFFFFFFFFFFFFFFFF; l_fapirc = FAPI_ATTR_GET(ATTR_VPD_CKE_PWR_MAP, - &l_fapi_mba_target, val3); + &l_fapi_mba_target, val6); if (l_fapirc) break; TS_TRACE( "testGetTermData attr " - "TERM_DATA_CKE_PWR_MAP=0x%08x,0x%08x", - val3[0], val3[1]); + "TERM_DATA_CKE_PWR_MAP=0x%016lx", val6); +#if HWPMBVPDACCESSORTEST_UT4 // TERM_DATA_RLO l_fapirc = FAPI_ATTR_GET(ATTR_VPD_RLO, &l_fapi_mba_target, val5); -- cgit v1.2.1