--- a/userlibandfileserver/fileserver/sfat32/inc/sl_std.h Wed Sep 15 13:42:27 2010 +0300
+++ b/userlibandfileserver/fileserver/sfat32/inc/sl_std.h Wed Oct 13 16:04:24 2010 +0300
@@ -92,12 +92,12 @@
//-- public interface to the local drive. Provides media driver's error handling (critical and non-critical user notifiers)
//-- and thread-safety if required.
- TInt ReadNonCritical(TInt64 aPos,TInt aLength,const TAny* aTrg,const RMessagePtr2 &aMessage,TInt anOffset, TUint aFlag) const;
+ TInt ReadNonCritical(TInt64 aPos,TInt aLength,const TAny* aTrg,const RMessagePtr2 &aMessage,TInt anOffset) const;
TInt ReadNonCritical(TInt64 aPos,TInt aLength,TDes8& aTrg) const;
TInt ReadCritical(TInt64 aPos,TInt aLength,TDes8& aTrg) const;
TInt WriteCritical(TInt64 aPos,const TDesC8& aSrc);
- TInt WriteNonCritical(TInt64 aPos,TInt aLength,const TAny* aSrc,const RMessagePtr2 &aMessage,TInt anOffset, TUint aFlag);
+ TInt WriteNonCritical(TInt64 aPos,TInt aLength,const TAny* aSrc,const RMessagePtr2 &aMessage,TInt anOffset);
TInt GetLastErrorInfo(TDes8& aErrorInfo) const;
@@ -148,9 +148,9 @@
inline void LeaveCriticalSection() const {iLock.Signal();}
//-- methods' wrappers that are used by TDriveInterface
- TInt Read(TInt64 aPos,TInt aLength,const TAny* aTrg,const RMessagePtr2 &aMessage,TInt anOffset, TUint aFlag) const;
+ TInt Read(TInt64 aPos,TInt aLength,const TAny* aTrg,const RMessagePtr2 &aMessage,TInt anOffset) const;
TInt Read(TInt64 aPos,TInt aLength,TDes8& aTrg) const;
- TInt Write(TInt64 aPos,TInt aLength,const TAny* aSrc,const RMessagePtr2 &aMessage,TInt anOffset, TUint aFlag);
+ TInt Write(TInt64 aPos,TInt aLength,const TAny* aSrc,const RMessagePtr2 &aMessage,TInt anOffset);
TInt Write(TInt64 aPos, const TDesC8& aSrc);
TInt GetLastErrorInfo(TDes8& aErrorInfo) const;
TInt Caps(TDes8& anInfo) const;
@@ -192,7 +192,7 @@
//-- pure virtual interface
virtual TUint32 ReadL(TUint32 aFatIndex) const = 0;
virtual void WriteL(TUint32 aFatIndex, TUint32 aValue) = 0;
- virtual TInt64 DataPositionInBytesL(TUint32 aCluster) const = 0;
+ virtual TInt64 DataPositionInBytes(TUint32 aCluster) const = 0;
virtual void MountL(const TMountParams& aMountParam) = 0;
//-----------------------------------------------------------------
//-- just virtual interface
@@ -266,7 +266,7 @@
inline TBool ClusterNumberValid(TUint32 aClusterNo) const;
typedef RArray<TUint> RClusterArray;
- void DoFreedClustersNotifyL(RClusterArray &aFreedClusters);
+ void DoFreedClustersNotify(RClusterArray &aFreedClusters);
protected:
@@ -336,7 +336,7 @@
@param aMessage Refrence to server message from request
@param anOffset Offset into read data to write
*/
- virtual void ReadL(TInt64 aPos,TInt aLength,const TAny* aTrg,const RMessagePtr2 &aMessage,TInt anOffset, TUint aFlag) const = 0;
+ virtual void ReadL(TInt64 aPos,TInt aLength,const TAny* aTrg,const RMessagePtr2 &aMessage,TInt anOffset) const = 0;
/**
Disk write function
@@ -347,7 +347,7 @@
@param aMessage Refrence to server message from request, contains data
@param anOffset Offset into write data to use in write
*/
- virtual void WriteL(TInt64 aPos,TInt aLength,const TAny* aSrc,const RMessagePtr2 &aMessage,TInt anOffset, TUint aFlag) = 0;
+ virtual void WriteL(TInt64 aPos,TInt aLength,const TAny* aSrc,const RMessagePtr2 &aMessage,TInt anOffset) = 0;
virtual inline MWTCacheInterface* DirCacheInterface();
@@ -570,8 +570,8 @@
void DirReadL(const TEntryPos& aPos,TInt aLength,TDes8& aDes) const;
void DirWriteL(const TEntryPos& aPos,const TDesC8& aDes);
- void ReadFromClusterListL(TEntryPos& aPos,TInt aLength,const TAny* aTrg,const RMessagePtr2& aMessage,TInt anOffset, TUint aFlag) const;
- void WriteToClusterListL(TEntryPos& aPos,TInt aLength,const TAny* aSrc,const RMessagePtr2& aMessage,TInt anOffset, TUint& aBadcluster, TUint& aGoodcluster, TUint aFlag);
+ void ReadFromClusterListL(TEntryPos& aPos,TInt aLength,const TAny* aTrg,const RMessagePtr2& aMessage,TInt anOffset) const;
+ void WriteToClusterListL(TEntryPos& aPos,TInt aLength,const TAny* aSrc,const RMessagePtr2& aMessage,TInt anOffset, TUint& aBadcluster, TUint& aGoodcluster);
void MoveToNextEntryL(TEntryPos& aPos) const;
void MoveToDosEntryL(TEntryPos& aPos,TFatDirEntry& anEntry) const;
@@ -703,8 +703,8 @@
void DoCheckFatForLoopsL(TUint32 aCluster, TUint32& aPreviousCluster, TUint32& aChangePreviousCluster, TUint32& aCount) const;
void InitializeL(const TLocalDriveCaps& aLocDrvCaps, TBool aIgnoreFSInfo=EFalse);
- void DoReadFromClusterListL(TEntryPos& aPos,TInt aLength,const TAny* aTrg,const RMessagePtr2& aMessage,TInt anOffset, TUint aFlag) const;
- void DoWriteToClusterListL(TEntryPos& aPos,TInt aLength,const TAny* aSrc,const RMessagePtr2& aMessage,TInt anOffset, TUint aLastcluster, TUint& aBadcluster, TUint& aGoodcluster, TUint aFlag);
+ void DoReadFromClusterListL(TEntryPos& aPos,TInt aLength,const TAny* aTrg,const RMessagePtr2& aMessage,TInt anOffset) const;
+ void DoWriteToClusterListL(TEntryPos& aPos,TInt aLength,const TAny* aSrc,const RMessagePtr2& aMessage,TInt anOffset, TUint aLastcluster, TUint& aBadcluster, TUint& aGoodcluster);
TBool IsUniqueNameL(const TShortName& aName, TUint32 aDirCluster);
TBool FindShortNameL(const TShortName& aName,TEntryPos& anEntryPos);
@@ -862,6 +862,7 @@
void SetSeekIndexValueL(TUint aFileCluster,TUint aStoredCluster);
void ResizeIndex(TInt aNewMult,TUint aNewSize);
TInt CalcSeekIndexSize(TUint aSize);
+ TBool IsSeekBackwards(TUint aPos);
void ClearIndex(TUint aNewSize);
void DoSetSizeL(TUint aSize, TBool aForceCachesFlush);
void WriteFileSizeL(TUint aSize);