--- a/userlibandfileserver/fileserver/sfat32/inc/sl_std.inl Tue Jan 19 13:48:03 2010 +0000
+++ b/userlibandfileserver/fileserver/sfat32/inc/sl_std.inl Mon Jan 18 21:31:10 2010 +0200
@@ -535,91 +535,6 @@
}
//---------------------------------------------------------------------------------------------------------------------------------
-//-- class RBitVector
-
-/** @return size of the vector (number of bits) */
-inline TUint32 RBitVector::Size() const
- {
- return iNumBits;
- }
-
-/**
- Get a bit by index
-
- @param aIndex index in a bit vector
- @return 0 if the bit at pos aIndex is 0, not zero otherwise
- @panic EIndexOutOfRange if aIndex is out of range
-*/
-inline TBool RBitVector::operator[](TUint32 aIndex) const
- {
- __ASSERT_ALWAYS(aIndex < iNumBits, Panic(EIndexOutOfRange));
- return (ipData[WordNum(aIndex)] & (1<<BitInWord(aIndex)));
- }
-
-/**
- Set a bit at pos aIndex to '1'
- @param aIndex index in a bit vector
- @panic EIndexOutOfRange if aIndex is out of range
-*/
-inline void RBitVector::SetBit(TUint32 aIndex)
- {
- __ASSERT_ALWAYS(aIndex < iNumBits, Panic(EIndexOutOfRange));
- ipData[WordNum(aIndex)] |= (1<<BitInWord(aIndex));
- }
-
-/**
- Set a bit at pos aIndex to '0'
- @param aIndex index in a bit vector
- @panic EIndexOutOfRange if aIndex is out of range
-*/
-inline void RBitVector::ResetBit(TUint32 aIndex)
- {
- __ASSERT_ALWAYS(aIndex < iNumBits, Panic(EIndexOutOfRange));
- ipData[WordNum(aIndex)] &= ~(1<<BitInWord(aIndex));
- }
-
-/**
- Invert a bit at pos aIndex
- @param aIndex index in a bit vector
- @panic EIndexOutOfRange if aIndex is out of range
-*/
-inline void RBitVector::InvertBit(TUint32 aIndex)
- {
- __ASSERT_ALWAYS(aIndex < iNumBits, Panic(EIndexOutOfRange));
- ipData[WordNum(aIndex)] ^= (1<<BitInWord(aIndex));
- }
-
-/**
- Set bit value at position aIndex
- @param aIndex index in a bit vector
- @panic EIndexOutOfRange if aIndex is out of range
-*/
-inline void RBitVector::SetBitVal(TUint32 aIndex, TBool aVal)
- {
- if(aVal)
- SetBit(aIndex);
- else
- ResetBit(aIndex);
- }
-
-
-inline TUint32 RBitVector::MaskLastWord(TUint32 aVal) const
- {
- const TUint32 shift = (32-(iNumBits & 0x1F)) & 0x1F;
- return (aVal << shift) >> shift; //-- mask unused high bits
- }
-
-
-
-inline TUint32 RBitVector::WordNum(TUint32 aBitPos) const
- {
- return aBitPos >> 5;
- }
-
-inline TUint32 RBitVector::BitInWord(TUint32 aBitPos) const
- {
- return aBitPos & 0x1F;
- }
/**
Calculate offset of the page starting position in the cluster