--- a/userlibandfileserver/fileserver/shostmassstorage/msproxy/tmsmemmap.inl Fri Apr 16 16:24:37 2010 +0300
+++ b/userlibandfileserver/fileserver/shostmassstorage/msproxy/tmsmemmap.inl Fri Apr 23 21:54:44 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of the License "Eclipse Public License v1.0"
@@ -26,9 +26,9 @@
}
-inline TInt TMsDataMemMap::BlockLength() const
+inline TUint32 TMsDataMemMap::BlockLength() const
{
- return KSectorSize;
+ return iSectorSize;
}
@@ -37,11 +37,20 @@
return iSize - iDataOffset;
}
-inline void TMsDataMemMap::InitDataArea(TUint32 aFirstDataSector, TUint32 aNumSectors)
- {
- iDataOffset = static_cast<TInt64>(aFirstDataSector) * KSectorSize;
- iSize = static_cast<TInt64>(aNumSectors) * KSectorSize;
- }
+inline void TMsDataMemMap::InitDataArea(TUint32 aFirstDataSector, TUint32 aNumSectors, TUint32 aSectorSize)
+ {
+ iSectorSize = aSectorSize;
+
+ iFormatSectorShift = 0;
+ while(aSectorSize)
+ {
+ ++iFormatSectorShift;
+ aSectorSize >>= 1;
+ }
+
+ iDataOffset = static_cast<TInt64>(aFirstDataSector) * iSectorSize;
+ iSize = static_cast<TInt64>(aNumSectors) * iSectorSize;
+ }
inline void TMsDataMemMap::InitDataArea(TUint64 aSize)
@@ -55,3 +64,8 @@
return aPos + iDataOffset;
}
+inline TInt TMsDataMemMap::FormatSectorShift() const
+ {
+ return iFormatSectorShift;
+ }
+