FCL/sf/os/kernelhwsrv: comparison userlibandfileserver/fileserver/sfat32/inc/sl

equal deleted inserted replaced

-:56f325a607ea
+:0173bcd7697c
 Interface class between the file system and the local drive media interface,
 handles incomplete writes to media with the ability to notify the user.
 This class can't be instantinated by user; only CFatMountCB can do this; see CFatMountCB::DriveInterface()
 */
-class TFatDriveInterface
+class TDriveInterface
 {
 public:
 	enum TAction {ERetry=1};
 public:
 //-- release the mutex guarding CProxyDrive.
 inline void ReleaseLock() const {iProxyDrive.LeaveCriticalSection();}
 protected:
-TFatDriveInterface();
+TDriveInterface();
-TFatDriveInterface(const TFatDriveInterface&);
+TDriveInterface(const TDriveInterface&);
-TFatDriveInterface& operator=(const TFatDriveInterface&);
+TDriveInterface& operator=(const TDriveInterface&);
 TBool Init(CFatMountCB* aMount);
 void Close();
 	inline TBool NotifyUser() const;
 TBool Init(CProxyDrive* aProxyDrive);
 inline void EnterCriticalSection() const {iLock.Wait();}
 inline void LeaveCriticalSection() const {iLock.Signal();}
-//-- methods' wrappers that are used by TFatDriveInterface
+//-- methods' wrappers that are used by TDriveInterface
 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);
 TInt Write(TInt64 aPos, const TDesC8& aSrc);
 TInt GetLastErrorInfo(TDes8& aErrorInfo) const;
 inline TInt     SectorSizeLog2() const;
 inline TUint32  FreeClusters() const;
-	inline TBool IsEof32Bit(TInt aCluster) const;
+inline TBool IsEndOfClusterCh(TUint32 aCluster) const;
-	inline TBool IsEof16Bit(TInt aCluster) const;
-	inline TBool IsEof12Bit(TInt aCluster) const;
 inline TFatType FatType() const;
 inline TBool IsFat12() const;
 inline TBool IsFat16() const;
 inline TBool IsFat32() const;
 inline TBool ClusterNumberValid(TUint32 aClusterNo) const;
 typedef RArray<TUint> RClusterArray;
 void DoFreedClustersNotify(RClusterArray &aFreedClusters);
 private:
 TUint32  iFreeClusters;     ///< Number of free cluster in the fat table
 	TUint32  iFreeClusterHint;  ///< this is just a hint to the free cluster number, not required to contain exact information.
 	TFatType iFatType;          ///< FAT type 12/16/32, cached from the iOwner
+TUint32  iFatEocCode;       ///< End Of Cluster Chain code, 0xff8 for FAT12, 0xfff8 for FAT16, and 0xffffff8 for FAT32
 TUint32  iMaxEntries;       ///< maximal number of FAT entries in the table. This value is taken from the CFatMount that calculates it
 };
 inline void SetState(TFatMntState aState);
 TInt OpenMountForWrite();
 TInt IsFinalised(TBool& aFinalised);
 /**
-A wrapper around TFatDriveInterface providing its instantination and destruction.
+A wrapper around TDriveInterface providing its instantination and destruction.
 You must not create objects of this class, use DriveInterface() instead.
 */
-class XDriveInterface: public TFatDriveInterface
+class XDriveInterface: public TDriveInterface
 {
 public:
-XDriveInterface() : TFatDriveInterface() {}
+XDriveInterface() : TDriveInterface() {}
 ~XDriveInterface() {Close();}
-TBool Init(CFatMountCB* aMount) {return TFatDriveInterface::Init(aMount);}
+TBool Init(CFatMountCB* aMount) {return TDriveInterface::Init(aMount);}
 };
 public:
 	inline TInt RootIndicator() const;
 inline TBool IsRootDir(const TEntryPos &aEntry) const;
 	inline CAsyncNotifier* Notifier() const;
-	inline TFatDriveInterface& DriveInterface() const;
+	inline TDriveInterface& DriveInterface() const;
+inline TBool IsEndOfClusterCh(TInt aCluster) const;
+	inline void SetEndOfClusterCh(TInt &aCluster) const;
 void ReadUidL(TInt aCluster,TEntry& anEntry) const;
 void ReadDirEntryL(const TEntryPos& aPos,TFatDirEntry& aDirEntry) const;
 	void WriteDirEntryL(const TEntryPos& aPos,const TFatDirEntry& aDirEntry);
 	void DoRenameOrReplaceL(const TDesC& anOldName,const TDesC& aNewName,TRenMode aMode,TEntryPos& aNewPos);
 	void FindDosNameL(const TDesC& aName,TUint anAtt,TEntryPos& aDosEntryPos,TFatDirEntry& aDosEntry,TDes& aFileName,TInt anError) const;
 	void Dismount();
-	TBool IsEndOfClusterCh(TInt aCluster) const;
-	void SetEndOfClusterCh(TInt &aCluster) const;
+void InitializeRootEntry(TFatDirEntry & anEntry) const;
-	void InitializeRootEntry(TFatDirEntry & anEntry) const;
 TInt64 MakeLinAddrL(const TEntryPos& aPos) const;
 inline const TFatConfig& FatConfig() const;
 TBool CheckVolumeTheSame();
 TBool   VolCleanFlagSupported() const;
 void    DoUpdateFSInfoSectorsL(TBool aInvalidateFSInfo);
 void    UnFinaliseMountL();
 void    DoReMountL();
+void    SetFatType(TFatType aFatType);
 private:
 TBool ValidClusterNumber(TUint32 aCluster) const;
 void  CheckUnvisitedClustersL(const RBitVector& aFatBitVec) const;
 TBool iReadOnly         : 1;///< if true, the drive is in read-only mode
 TBool iRamDrive         : 1;///< true if this is a RAM drive
 TBool iMainBootSecValid : 1;///< true if the main boot sector is valid, if false, a backup boot sector may be in use.
 TFatMntState iState;        ///< this mounnt internal state
 TFatType iFatType;          ///< FAT type, FAT12,16 or 32
+TUint32  iFatEocCode;       ///< End Of Cluster Chain code, 0xff8 for FAT12, 0xfff8 for FAT16, and 0xffffff8 for FAT32
 CLeafDirCache* iLeafDirCache;	///< A cache for most recently visited directories, only valid when limit is set bigger than 1
 HBufC* iLastLeafDir;        	///< The last visited directory, only valid when limit of iLeafDirCache is less than 1
 TInt iLastLeafDirCluster;   	///< Cluster number of the last visited cluster, only valid when limit of iLeafDirCache is less than 1
 #endif
 friend class CFatFormatCB;
 friend class CScanDrive;
-friend class TFatDriveInterface;
+friend class TDriveInterface;
 	};
 private:
 	TUint32* iSeekIndex;    ///< Seek index into file
 	TInt iSeekIndexSize;    ///< size of seek index
-	TBool iAttPending;
 	TInt iStartCluster;     ///< Start cluster number of file
 	TEntryPos iCurrentPos;  ///< Current position in file data
 	TEntryPos iFileDirPos;  ///< File directory entry position
 	TBool iFileSizeModified;
 	};
-//
 /**
 Fat file system directory subsession implmentation, provides all that is required of a plug in
 file system directory as well as Fat specific functionality
 */
 	TInt Install();
 	CMountCB* NewMountL() const;
 	CFileCB* NewFileL() const;
 	CDirCB* NewDirL() const;
 	CFormatCB* NewFormatL() const;
-	void DriveInfo(TDriveInfo& anInfo,TInt aDriveNumber) const;
 	TInt DefaultPath(TDes& aPath) const;
 	TBool IsExtensionSupported() const;
 	TBool GetUseLocalTime() const;
 	void SetUseLocalTime(TBool aFlag);
 	TInt GetInterface(TInt aInterfaceId, TAny*& aInterface,TAny* aInput);
 //
 TPtrC RemoveTrailingDots(const TDesC& aName);
 /**
-Indicates if a number passed in is a power of two
-@return ETrue if aVal is a power of 2
-*/
-inline TBool IsPowerOf2(TUint32 aVal);
-/**
 Calculates the log2 of a number
 @param aNum Number to calulate the log two of
 @return The log two of the number passed in
 */
 TUint32 Log2(TUint32 aVal);
-/** @return 2^aVal*/
-inline TUint32 Pow2(TUint32 aVal);
 /**
 Converts Dos time (from a directory entry) to TTime format
 @param the Dos name for the directory entry
 @return the checksum
 */
 TUint8 CalculateShortNameCheckSum(const TDesC8& aShortName);
+TUint32 EocCodeByFatType(TFatType aFatType);
 //-----------------------------------------------------------------------------

changeset 33	0173bcd7697c
parent 0	a41df078684a
child 36	538db54a451d