summaryrefslogtreecommitdiffstats
path: root/src/usr/diag/prdf/common/framework
diff options
context:
space:
mode:
authorZane Shelley <zshelle@us.ibm.com>2017-01-31 16:32:29 -0600
committerZane C. Shelley <zshelle@us.ibm.com>2017-02-13 12:57:59 -0500
commit3192051cd7b428aa85469525ce1595ab669332fe (patch)
treeaf44715961dee8846358a0ae435a3d431c2097b0 /src/usr/diag/prdf/common/framework
parent6553e4a7f5008da02255b489f4ddc7c8e4d9fd1c (diff)
downloadtalos-hostboot-3192051cd7b428aa85469525ce1595ab669332fe.tar.gz
talos-hostboot-3192051cd7b428aa85469525ce1595ab669332fe.zip
PRD: clean various BitString functions
Change-Id: Id10ac2c18792336103b3d132c263fab87904b925 RTC: 167819 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35693 Reviewed-by: Benjamin J. Weisenbeck <bweisenb@us.ibm.com> Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com> Reviewed-by: Brian J. Stegmiller <bjs@us.ibm.com> Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com> Tested-by: Zane C. Shelley <zshelle@us.ibm.com> Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/36318 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Diffstat (limited to 'src/usr/diag/prdf/common/framework')
-rwxr-xr-xsrc/usr/diag/prdf/common/framework/register/iipErrorRegisterMask.h4
-rwxr-xr-xsrc/usr/diag/prdf/common/framework/register/iipscr.C4
-rwxr-xr-xsrc/usr/diag/prdf/common/framework/register/iipscr.h10
-rwxr-xr-xsrc/usr/diag/prdf/common/framework/register/prdfCaptureData.C2
-rwxr-xr-xsrc/usr/diag/prdf/common/framework/register/prdfOperatorRegister.H4
-rwxr-xr-xsrc/usr/diag/prdf/common/framework/register/prdfResetErrorRegister.C2
-rwxr-xr-xsrc/usr/diag/prdf/common/framework/register/prdfResetOperators.H2
7 files changed, 14 insertions, 14 deletions
diff --git a/src/usr/diag/prdf/common/framework/register/iipErrorRegisterMask.h b/src/usr/diag/prdf/common/framework/register/iipErrorRegisterMask.h
index e74bdb6e3..9d615f18a 100755
--- a/src/usr/diag/prdf/common/framework/register/iipErrorRegisterMask.h
+++ b/src/usr/diag/prdf/common/framework/register/iipErrorRegisterMask.h
@@ -134,7 +134,7 @@ public:
<br><b>Parameters: </b> bit position
<br><b>Returns: </b> None.
<br><b>Requirements:</b> None.
- <br><b>Promises: </b> bitStringMask.IsSet(bitPosition) == true.
+ <br><b>Promises: </b> bitStringMask.isBitSet(bitPosition) == true.
<br><b>Exceptions: </b> None.
<br><b>Notes: </b> The bitstring read from hardware during Read()
@@ -215,7 +215,7 @@ private: // Data
};
inline void ErrorRegisterMask::SetMaskBit(uint32_t bitPosition)
-{ bitStringMask.Set(bitPosition); }
+{ bitStringMask.setBit(bitPosition); }
inline void ErrorRegisterMask::SetMaskBits(const BIT_STRING_CLASS & bitString)
{ bitStringMask.setString(bitString); }
diff --git a/src/usr/diag/prdf/common/framework/register/iipscr.C b/src/usr/diag/prdf/common/framework/register/iipscr.C
index 30537d131..e8eda7881 100755
--- a/src/usr/diag/prdf/common/framework/register/iipscr.C
+++ b/src/usr/diag/prdf/common/framework/register/iipscr.C
@@ -150,7 +150,7 @@ void SCAN_COMM_REGISTER_CLASS::SetBit
{
BIT_STRING_CLASS & bitString = AccessBitString();
- bitString.Set(bit_position);
+ bitString.setBit(bit_position);
}
// Function Specification //////////////////////////////////////////
@@ -176,7 +176,7 @@ void SCAN_COMM_REGISTER_CLASS::ClearBit
/*!o No value returned */
{
BIT_STRING_CLASS & bitString = AccessBitString();
- bitString.Clear(bit_position);
+ bitString.clearBit(bit_position);
}
diff --git a/src/usr/diag/prdf/common/framework/register/iipscr.h b/src/usr/diag/prdf/common/framework/register/iipscr.h
index a51920aca..0eaf3e9ba 100755
--- a/src/usr/diag/prdf/common/framework/register/iipscr.h
+++ b/src/usr/diag/prdf/common/framework/register/iipscr.h
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2012,2015 */
+/* Contributors Listed Below - COPYRIGHT 2012,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -308,7 +308,7 @@ class SCAN_COMM_REGISTER_CLASS
<br><b>Parameters: </b> Position of bit to set (= 1)
<br><b>Returns: </b> None.
<br><b>Requirements:</b> bit position < GetBitString()->Length()
- <br><b>Promises: </b> GetBitString()->IsSet(bit_position) == true
+ <br><b>Promises: </b> GetBitString()->isBitSet(bit_position) == true
<br><b>Exceptions: </b> None.
<br><b> Notes: </b> Register value is not reflected in hardware until
Write() is called
@@ -322,7 +322,7 @@ class SCAN_COMM_REGISTER_CLASS
<br><b>Parameters: </b> Position of bit to clear (= 0)
<br><b>Returns: </b> None.
<br><b>Requirements:</b> bit position < GetBitString()->Length()
- <br><b>Promises: </b> GetBitString()->IsSet(bit_position) == false
+ <br><b>Promises: </b> GetBitString()->isBitSet(bit_position) == false
<br><b>Exceptions: </b> None.
<br><b> Notes: </b> Register value is not reflected in hardware until
Write() is called
@@ -337,7 +337,7 @@ class SCAN_COMM_REGISTER_CLASS
* @return TRUE if the bit is set, FALSE otherwise.
*/
bool IsBitSet( uint32_t i_bitPos )
- { return GetBitString()->IsSet(i_bitPos); }
+ { return GetBitString()->isBitSet(i_bitPos); }
/** @brief Flushes all bits to 0. */
void clearAllBits();
@@ -375,7 +375,7 @@ class SCAN_COMM_REGISTER_CLASS
</ul><br>
*/
bool BitStringIsZero()
- { return GetBitString()->IsZero(); }
+ { return GetBitString()->isZero(); }
/**
*@brief Returns TYPE_NA as type of Target associated with register.Actual
diff --git a/src/usr/diag/prdf/common/framework/register/prdfCaptureData.C b/src/usr/diag/prdf/common/framework/register/prdfCaptureData.C
index bec75cd9c..4990e2323 100755
--- a/src/usr/diag/prdf/common/framework/register/prdfCaptureData.C
+++ b/src/usr/diag/prdf/common/framework/register/prdfCaptureData.C
@@ -87,7 +87,7 @@ void CaptureData::AddDataElement( TargetHandle_t i_trgt, int i_scomId,
size_t sz_buf = 0;
// Add buffer only if the value is non-zero.
- if ( !i_bs->IsZero() )
+ if ( !i_bs->isZero() )
{
// Get the size of i_bs and ensure byte alignment.
sz_buf = (i_bs->getBitLen() + 8-1) / 8;
diff --git a/src/usr/diag/prdf/common/framework/register/prdfOperatorRegister.H b/src/usr/diag/prdf/common/framework/register/prdfOperatorRegister.H
index 093205985..edfc46a30 100755
--- a/src/usr/diag/prdf/common/framework/register/prdfOperatorRegister.H
+++ b/src/usr/diag/prdf/common/framework/register/prdfOperatorRegister.H
@@ -127,9 +127,9 @@ class SummaryRegister : public SCAN_COMM_REGISTER_CLASS
PRDF::BitString tmp = *iv_child->GetBitString(i_type);
//if any bits are set in iv_child, then set the iv_amount bit
- if (0 != tmp.GetSetCount())
+ if (0 != tmp.getSetCount())
{
- iv_bs->Set(0);
+ iv_bs->setBit(0);
*iv_bs = *iv_bs >> iv_amount;
}
return iv_bs;
diff --git a/src/usr/diag/prdf/common/framework/register/prdfResetErrorRegister.C b/src/usr/diag/prdf/common/framework/register/prdfResetErrorRegister.C
index 2c50bdda8..7a35fd39a 100755
--- a/src/usr/diag/prdf/common/framework/register/prdfResetErrorRegister.C
+++ b/src/usr/diag/prdf/common/framework/register/prdfResetErrorRegister.C
@@ -194,7 +194,7 @@ int32_t AndResetErrorRegister::Reset(const BitKey & bit_list,
uint32_t i;
for(i = 0; i < bl_length; ++i) // Turn off all bits used to isolate problem
{
- bs.Clear(bit_list.getListValue(i));
+ bs.clearBit(bit_list.getListValue(i));
}
xAndResetScr.SetBitString(&bs); // copy bs to SCR bit string
rc = xAndResetScr.Write(); // Write hardware (result = Hareware value ANDed with bs)
diff --git a/src/usr/diag/prdf/common/framework/register/prdfResetOperators.H b/src/usr/diag/prdf/common/framework/register/prdfResetOperators.H
index d31ad9556..3b8fafa80 100755
--- a/src/usr/diag/prdf/common/framework/register/prdfResetOperators.H
+++ b/src/usr/diag/prdf/common/framework/register/prdfResetOperators.H
@@ -193,7 +193,7 @@ class AndOperator : public RegisterResetOperator
uint32_t i;
for(i = 0; i < bl_length; ++i) // Turn off all bits specified
{
- bs.Clear(bl.getListValue(i));
+ bs.clearBit(bl.getListValue(i));
}
writeReg->SetBitString(&bs); // Copy bit-string to register.
rc = writeReg->Write(); // Write hardware
OpenPOWER on IntegriCloud