diff options
author | Zane Shelley <zshelle@us.ibm.com> | 2016-02-24 16:32:00 -0600 |
---|---|---|
committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2016-03-14 13:51:28 -0400 |
commit | cf97612a75781b8654dbed72707ea975dfbfca14 (patch) | |
tree | ef7c094da1c56960790de585ca0282c0f2976197 | |
parent | 8960ec2bcf902795b305e2991fbfc8d4445e512e (diff) | |
download | talos-hostboot-cf97612a75781b8654dbed72707ea975dfbfca14.tar.gz talos-hostboot-cf97612a75781b8654dbed72707ea975dfbfca14.zip |
PRD: Removed obsolete class HomRegisterAccessScom
Change-Id: Ia78d4775bb9f43f115745838915eace948ad0c27
RTC: 147695
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/21192
Tested-by: Jenkins Server
Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com>
Reviewed-by: Benjamin J. Weisenbeck <bweisenb@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/21926
Tested-by: FSP CI Jenkins
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
4 files changed, 4 insertions, 114 deletions
diff --git a/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.C b/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.C index 7586e8a1c..75703737f 100755 --- a/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.C +++ b/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.C @@ -343,22 +343,4 @@ errlHndl_t ScomAccessor::Access(TargetHandle_t i_target, return errH; } -//------------------------------------------------------------------------------ - -uint32_t HomRegisterAccessScom::Access( BIT_STRING_CLASS & bs, - uint64_t registerId, - Operation operation) const -{ - PRDF_DENTER("HomRegisterAccessScom::Access()"); - - uint32_t rc = getScomService().Access(iv_ptargetHandle, - bs, - registerId, - operation); - - PRDF_DEXIT("HomRegisterAccessScom::Access() rc=%d", rc); - - return rc; -} - } // End namespace PRDF diff --git a/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.H b/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.H index d1369f5b8..e54de2aaf 100755 --- a/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.H +++ b/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.H @@ -154,84 +154,6 @@ class ScomService ScomAccessor * iv_ScomAccessor; }; -/** - Access Scan comm via the HOM - @author Doug Gilbert - @par - @code - @endcode -*/ -class HomRegisterAccessScom : public MopRegisterAccess -{ -public: - /** - Constructor - @param - @returns - @pre - @post - @see - @note - */ - inline HomRegisterAccessScom(TARGETING::TargetHandle_t i_ptargetHandle ); - inline HomRegisterAccessScom(void); - - /* - Destructor - */ - // ~HomRegisterAccessScom(); - - /** - Access the scan com register - @param BIT_STRING_CLASS - holds data read or to write - @param register address - @param [READ|WRITE] - @returns [SUCCESS|FAIL] - @pre bs.Length() must be size of register data to read/write - @post For read operation, bs is modified to reflect hardware register state - @note - */ - virtual uint32_t Access(BIT_STRING_CLASS & bs, - uint64_t registerId, - Operation operation) const; - - /** - Get the handle used to pass to access (obsolite???) - @param returnes number of targethandles in TargetHandle list - @returns list of targethandles - @pre none - @post none - @note Can this be removed from the framework??? - */ - inline virtual const TARGETING::TargetHandle_t * GetChipIds(int & count) const { count = 0; return NULL;} - - bool operator==(const HomRegisterAccessScom & hrm) - { - return (hrm.iv_ptargetHandle == iv_ptargetHandle); - } - -private: // functions -private: // Data - - // maybe we should store the functionalUnitPtr instead - TARGETING::TargetHandle_t iv_ptargetHandle; - -}; - -struct ScanRingField -{ - uint64_t registerId; - uint32_t length; -}; - -inline HomRegisterAccessScom::HomRegisterAccessScom(TARGETING::TargetHandle_t i_ptargetHandle ) -: MopRegisterAccess(), iv_ptargetHandle(i_ptargetHandle ) -{} - -inline HomRegisterAccessScom::HomRegisterAccessScom() -: MopRegisterAccess(), iv_ptargetHandle(NULL) -{} - } // End namespace PRDF #endif /* PRDFHOMREGISTERACCESS_H */ diff --git a/src/usr/diag/prdf/common/framework/register/prdfScanFacility.H b/src/usr/diag/prdf/common/framework/register/prdfScanFacility.H index 63dab2bd7..93945937f 100755 --- a/src/usr/diag/prdf/common/framework/register/prdfScanFacility.H +++ b/src/usr/diag/prdf/common/framework/register/prdfScanFacility.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2015 */ +/* Contributors Listed Below - COPYRIGHT 2012,2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -54,20 +54,6 @@ namespace PRDF @par The Scan facility is used by PRD to access Scan and Scan Comm @ functions.It attempts to reduce duplicate objects and their @ aggragates as must as possible. - @code - ScanFacility & sf = ScanFacility::Access(); - SCAN_COMM_REGISTER_CLASS & scr = sf.GetScanCommRegister(chipId,Address,bitLen); - scr.Read() ... see iipscr.h - ScanRingField srf[] = - {{hregAliasId1 , fieldBitLength1}, - {hregAliasId2 , fieldBitLength2}}; - SCAN_COMM_REGISTER_CLASS & sr = s.GetScanRingRegister(aTARGETING:: - TargetHandle_t,srf,srf+2); - scr.Read() .... SCAN_COMM_REGISTER_CLASS - // Note you can't write a scan ring register from PRD - // you can only read scan ring registers from PRD if the global attention - // type is CHECK_STOP - @endcode */ class ScanFacility { diff --git a/src/usr/diag/prdf/test/prdfsimHomRegisterAccess.C b/src/usr/diag/prdf/test/prdfsimHomRegisterAccess.C index d2882cc09..266254198 100755 --- a/src/usr/diag/prdf/test/prdfsimHomRegisterAccess.C +++ b/src/usr/diag/prdf/test/prdfsimHomRegisterAccess.C @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2012,2016 */ +/* [+] 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. */ @@ -49,8 +51,6 @@ errlHndl_t SimScomAccessor::Access(TARGETING::TargetHandle_t i_target, do { -// Don't want to issue actual scom op to HW -// rc = HomRegisterAccessScom::Access( bs, registerId, operation); switch (operation) { case MopRegisterAccess::WRITE: l_op = ScrDB::WRITE; break; |