diff options
Diffstat (limited to 'src/usr/diag/prdf/common/framework/register/prdfScanFacility.C')
-rwxr-xr-x | src/usr/diag/prdf/common/framework/register/prdfScanFacility.C | 53 |
1 files changed, 28 insertions, 25 deletions
diff --git a/src/usr/diag/prdf/common/framework/register/prdfScanFacility.C b/src/usr/diag/prdf/common/framework/register/prdfScanFacility.C index 5228f9a87..310d37a98 100755 --- a/src/usr/diag/prdf/common/framework/register/prdfScanFacility.C +++ b/src/usr/diag/prdf/common/framework/register/prdfScanFacility.C @@ -37,6 +37,9 @@ #undef prdfScanFacility_C +namespace PRDF +{ + //---------------------------------------------------------------------- // Constants //---------------------------------------------------------------------- @@ -71,8 +74,8 @@ bool operator<(const ScanCommRegisterChip & scrc1, const ScanCommRegisterChip & //---------------------------------------------------------------------- // Global Variables //---------------------------------------------------------------------- -PrdfNullRegister PrdfAttnTypeRegister::cv_null(1024); //@01 +NullRegister AttnTypeRegister::cv_null(1024); //--------------------------------------------------------------------- // Member Function Specifications @@ -86,23 +89,21 @@ ScanFacility & ScanFacility::Access(void) static ScanFacility sf; return sf; } -//------------------------------------------------------------------------------------------------- +//------------------------------------------------------------------------------ SCAN_COMM_REGISTER_CLASS & ScanFacility::GetScanCommRegister(TARGETING::TargetHandle_t i_ptargetHandle, uint64_t address, uint32_t bitLength) { - using namespace PRDF; HomRegisterAccessScom hraKey(i_ptargetHandle); HomRegisterAccessScom & hra = iv_scomAccessFw.get(hraKey); ScanCommRegisterChip scrKey(address,bitLength,hra); return iv_scomRegFw.get(scrKey); } -//------------------------------------------------------------------------------------------------- +//------------------------------------------------------------------------------ SCAN_COMM_REGISTER_CLASS & ScanFacility::GetScanRingRegister(TARGETING::TargetHandle_t i_ptargetHandle, - PRDF::ScanRingField * start, - PRDF::ScanRingField * end) + ScanRingField * start, + ScanRingField * end) { - using namespace PRDF; uint32_t bitLength = 0; for(ScanRingField * srf = start; srf != end; ++srf) { @@ -114,66 +115,68 @@ SCAN_COMM_REGISTER_CLASS & ScanFacility::GetScanRingRegister(TARGETING::TargetHa return iv_scomRegFw.get(scrKey); } -//------------------------------------------------------------------------------------------------- +//------------------------------------------------------------------------------ SCAN_COMM_REGISTER_CLASS & ScanFacility::GetNotRegister(SCAN_COMM_REGISTER_CLASS & i_arg) { - PrdfNotRegister r(i_arg); + NotRegister r(i_arg); return iv_notRegFw.get(r); } -//------------------------------------------------------------------------------------------------- +//------------------------------------------------------------------------------ SCAN_COMM_REGISTER_CLASS & ScanFacility::GetLeftShiftRegister(SCAN_COMM_REGISTER_CLASS & i_arg, uint16_t i_amount) { - PrdfLeftShiftRegister r(i_arg, i_amount); + LeftShiftRegister r(i_arg, i_amount); return iv_leftRegFw.get(r); } -//------------------------------------------------------------------------------------------------- +//------------------------------------------------------------------------------ SCAN_COMM_REGISTER_CLASS & ScanFacility::GetRightShiftRegister(SCAN_COMM_REGISTER_CLASS & i_arg, uint16_t i_amount) { - PrdfRightShiftRegister r(i_arg, i_amount); + RightShiftRegister r(i_arg, i_amount); return iv_rightRegFw.get(r); } -//------------------------------------------------------------------------------------------------- +//------------------------------------------------------------------------------ SCAN_COMM_REGISTER_CLASS & ScanFacility::GetAndRegister(SCAN_COMM_REGISTER_CLASS & i_left, SCAN_COMM_REGISTER_CLASS & i_right) { - PrdfAndRegister r(i_left,i_right); + AndRegister r(i_left,i_right); return iv_andRegFw.get(r); } -//------------------------------------------------------------------------------------------------- +//------------------------------------------------------------------------------ -SCAN_COMM_REGISTER_CLASS & ScanFacility::GetOrRegister(SCAN_COMM_REGISTER_CLASS & i_left, - SCAN_COMM_REGISTER_CLASS & i_right) +SCAN_COMM_REGISTER_CLASS & ScanFacility::GetOrRegister( + SCAN_COMM_REGISTER_CLASS & i_left, + SCAN_COMM_REGISTER_CLASS & i_right ) { - PrdfOrRegister r(i_left,i_right); - return iv_orRegFw.get(r); + OrRegister r(i_left, i_right); + return iv_orRegFw.get(r); } -//------------------------------------------------------------------------------------------------- +//------------------------------------------------------------------------------ SCAN_COMM_REGISTER_CLASS & ScanFacility::GetAttnTypeRegister(SCAN_COMM_REGISTER_CLASS & i_check, SCAN_COMM_REGISTER_CLASS & i_recov, SCAN_COMM_REGISTER_CLASS & i_special, SCAN_COMM_REGISTER_CLASS & i_proccs) { - PrdfAttnTypeRegister r(i_check,i_recov,i_special,i_proccs); + AttnTypeRegister r(i_check,i_recov,i_special,i_proccs); return iv_attnRegFw.get(r); } -//------------------------------------------------------------------------------------------------- +//------------------------------------------------------------------------------ SCAN_COMM_REGISTER_CLASS & ScanFacility::GetConstantRegister(BIT_STRING_CLASS i_val) { - PrdfConstantRegister r(i_val); + ConstantRegister r(i_val); return iv_constRegFw.get(r); } -//------------------------------------------------------------------------------------------------- +} // end namespace PRDF + |