FCL/sf/os/kernelhwsrv: comparison userlibandfileserver/fileserver/sfat/sl

equal deleted inserted replaced

-:a41df078684a
+:4122176ea935
 /**
 @file
 */
+//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+//!!
+//!! WARNING!! DO NOT edit this file !! '\sfat' component is obsolete and is not being used. '\sfat32'replaces it
+//!!
+//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 #include "sl_std.h"
 #include "sl_cache.h"
 #include "sl_leafdir_cache.h"
 TInt r=LocalDrive()->Read(aMediaPos, KSizeOfFatBootSector, bootSecBuf);
 if (r != KErrNone)
 {
 __PRINT2(_L("CFatMountCB::DoReadBootSector() failed! drv:%d, code:%d"),Drive().DriveNumber(),r);
-	    //-- fiddling with the error code; taken from MountL()
+//-- fiddling with the error code; taken from MountL()
 if (r==KErrNotSupported)
-		    return KErrNotReady;
+return KErrNotReady;
 #if defined(_LOCKABLE_MEDIA)
-	    else if(r==KErrLocked)
+else if(r==KErrLocked)
-		    return KErrLocked;
+return KErrLocked;
 #endif
-	    else if (r!=KErrNoMemory && r!=KErrNotReady && r!=KErrCorrupt && r!=KErrUnknown)
+else if (r!=KErrNoMemory && r!=KErrNotReady && r!=KErrCorrupt && r!=KErrUnknown)
 return KErrCorrupt;
 return r;
 }
 @param aVolumeLabel Descriptor containing the new volume label
 @leave
 */
 void CFatMountCB::WriteVolumeLabelL(const TDesC8& aVolumeLabel) const
-	{
+{
 if(aVolumeLabel.Length() > KVolumeLabelSize)
 User::Leave(KErrArgument);
-	User::LeaveIfError(LocalDrive()->Write(KFat16VolumeLabelPos,aVolumeLabel));
+User::LeaveIfError(LocalDrive()->Write(KFat16VolumeLabelPos,aVolumeLabel));
 }
 //-------------------------------------------------------------------------------------------------------------------
-const TUint16 KFat16CleanShutDownMask	= 0x08000;    ///< Mask used to indicate test clean/dirty bit for Fat16
+const TUint16 KFat16CleanShutDownMask   = 0x08000;    ///< Mask used to indicate test clean/dirty bit for Fat16
 /**
 Set or reset "VolumeClean" (ClnShutBitmask) flag.
 @param  aClean if ETrue, marks the volume as clean, otherwise as dirty.
 @leave  if write error occured.
 */
 void CFatMountCB::SetVolumeCleanL(TBool aClean)
 {
-	//-- The volume can't be set clean if there are objects opened on it. This precondition must be checked before calling this function
+//-- The volume can't be set clean if there are objects opened on it. This precondition must be checked before calling this function
 if(aClean && LockStatus()!=0)
 {
 __PRINT1(_L("#- CFatMountCB::SetVolumeCleanL drive:%d isn't free!"),DriveNumber());
 ASSERT(0);
 User::Leave(KErrInUse);
 return;
 }
 if(FatType() == EFat12)
 {//-- Fat12 doesn't support this feature; do nothing other than notify the underlying drive
-		 //   (ignoring any error for now as there's nothing we can do with it)
+//   (ignoring any error for now as there's nothing we can do with it)
-		(void)LocalDrive()->Finalise(aClean);
+(void)LocalDrive()->Finalise(aClean);
-		return;
+return;
 }
 //-- further read and write will be directly from the CProxyDrive, bypassing FAT cache.
 //-- this is because CFatTable doesn't allow access to FAT[1]
 {
 const TInt64 pos = StartOfFatInBytes()+KFatEntrySize+(FatSizeInBytes()*i);
 User::LeaveIfError(LocalDrive()->Write(pos, ptrFatEntry)); //write FAT16[1] entry
 }
 }
-		     //-- Notify the underlying media that the mount is consistent
+//-- Notify the underlying media that the mount is consistent
-		     //   (ignoring any error for now as there's nothing we can do with it)
+//   (ignoring any error for now as there's nothing we can do with it)
-		    (void)LocalDrive()->Finalise(aClean);
+(void)LocalDrive()->Finalise(aClean);
 __PRINT2(_L("#- CFatMountCB::SetVolumeCleanL() entry:  %x->%x"), tmp, fatEntry);
 }
 else //if(FatConfig().FAT16_UseCleanShutDownBit())
 @param aForceMount Flag to indicate whether mount should be forced to succeed if an error occurs
 @leave KErrNoMemory,KErrNotReady,KErrCorrupt,KErrUnknown.
 */
 void CFatMountCB::MountL(TBool aForceMount)
-	{
+{
 const TInt driveNo = Drive().DriveNumber();
 __PRINT2(_L("CFatMountCB::MountL() drv:%d, forceMount=%d\n"),driveNo,aForceMount);
 ASSERT(State() == ENotMounted || State() == EDismounted);
 SetState(EMounting);
 SetReadOnly(EFalse);
-	User::LeaveIfError(CreateDrive(Drive().DriveNumber()));
+User::LeaveIfError(CreateDrive(Drive().DriveNumber()));
 //-- read FAT configuration parameters from estart.txt
 iFatConfig.ReadConfig(driveNo);
 //-- initialise interface to the low-level drive access
 if(!iDriverInterface.Init(this))
 User::LeaveIfError(KErrNoMemory);
-	//-- get drive capabilities
+//-- get drive capabilities
 TLocalDriveCapsV2Buf capsBuf;
-	User::LeaveIfError(LocalDrive()->Caps(capsBuf));
+User::LeaveIfError(LocalDrive()->Caps(capsBuf));
 iSize=capsBuf().iSize;
 iRamDrive = EFalse;
 if(capsBuf().iMediaAtt & KMediaAttVariableSize)
 {//-- this is a RAM drive
-		UserSvr::UnlockRamDrive();
+UserSvr::UnlockRamDrive();
 iRamDrive = ETrue;
-	}
+}
-	if(aForceMount)
+if(aForceMount)
-	{//-- the state is "forcedly mounted", special case. This is an inconsistent state.
+{//-- the state is "forcedly mounted", special case. This is an inconsistent state.
 SetState(EInit_Forced);
-	return;
+return;
 }
 //-- read and validate boot sector (sector 0)
 TFatBootSector bootSector;
 User::LeaveIfError(ReadBootSector(bootSector, iRamDrive));
 //-- print out boot sector debug information
 bootSector.PrintDebugInfo();
-	//-- determine FAT type by data from boot sector. This is done by counting number of clusters, not by BPB_RootEntCnt
+//-- determine FAT type by data from boot sector. This is done by counting number of clusters, not by BPB_RootEntCnt
 iFatType=bootSector.FatType();
 ASSERT(iFatType != EInvalid); //-- this shall be checked in ReadBootSector()
 //-- values from the boot sector are checked in TFatBootSector::IsValid()
 //-- store volume UID, it can be checked on Remount
 InitializeL(capsBuf());
 ASSERT(State()==EInit_R);
 GetVolumeLabelFromDiskL(bootSector);
-	__PRINT2(_L("CFatMountCB::MountL() Completed, drv: %d, state:%d"), DriveNumber(), State());
+__PRINT2(_L("CFatMountCB::MountL() Completed, drv: %d, state:%d"), DriveNumber(), State());
-	}
+}
 //-------------------------------------------------------------------------------------------------------------------
 @param  aLocDrvCaps local drive capabilities
 @leave KErrNoMemory,KErrNotReady,KErrCorrupt,KErrUnknown.
 */
 void CFatMountCB::InitializeL(const TLocalDriveCaps& aLocDrvCaps, TBool /*aIgnoreFSInfo=EFalse*/)
-	{
+{
 __PRINT1(_L("CFatMountCB::InitializeL() drv:%d"), DriveNumber());
 ASSERT(State() == EMounting); //-- we must get here only from MountL()
 //========== Find out number of clusters on the volume
-	if(iRamDrive && SectorsPerCluster()!=1)
+if(iRamDrive && SectorsPerCluster()!=1)
-		{// Align iFirstFreeByte to cluster boundary if internal ram drive
+{// Align iFirstFreeByte to cluster boundary if internal ram drive
-		const TInt sectorsPerClusterLog2=ClusterSizeLog2()-SectorSizeLog2();
+const TInt sectorsPerClusterLog2=ClusterSizeLog2()-SectorSizeLog2();
-		const TInt rootDirEndSector=RootDirEnd()>>SectorSizeLog2();
+const TInt rootDirEndSector=RootDirEnd()>>SectorSizeLog2();
-		const TInt alignedSector=((rootDirEndSector+SectorsPerCluster()-1)>>sectorsPerClusterLog2)<<sectorsPerClusterLog2;
+const TInt alignedSector=((rootDirEndSector+SectorsPerCluster()-1)>>sectorsPerClusterLog2)<<sectorsPerClusterLog2;
-		iFirstFreeByte=alignedSector<<SectorSizeLog2();
+iFirstFreeByte=alignedSector<<SectorSizeLog2();
-		}
+}
-	else
+else
-		{
+{
-		iFirstFreeByte=RootDirEnd();
+iFirstFreeByte=RootDirEnd();
-		}
+}
-	    {//-- check if volume geometry looks valid
+{//-- check if volume geometry looks valid
-	    const TInt usableSectors=TotalSectors()-(iFirstFreeByte>>SectorSizeLog2());
+const TInt usableSectors=TotalSectors()-(iFirstFreeByte>>SectorSizeLog2());
-	    iUsableClusters=usableSectors>>(ClusterSizeLog2()-SectorSizeLog2());
+iUsableClusters=usableSectors>>(ClusterSizeLog2()-SectorSizeLog2());
 const TUint32 KMinClusters = 32; //-- absolute minimum number of clusters on the volume
 const TUint32 KMaxClusters =(TotalSectors()-FirstFatSector()-NumberOfFats()*(FatSizeInBytes()>>SectorSizeLog2())) >> (ClusterSizeLog2()-SectorSizeLog2());
 if(usableSectors <=0 || iUsableClusters < KMinClusters || iUsableClusters > KMaxClusters)
 User::Leave(KErrCorrupt);
 }
 }
-	//========== initialise RawDisk interface
+//========== initialise RawDisk interface
-	//-- CFatMountCB parameters might have changed, e.g. after formatting. Reconstruct directory cache with new parameters
+//-- CFatMountCB parameters might have changed, e.g. after formatting. Reconstruct directory cache with new parameters
 delete iRawDisk;
-	iRawDisk=CRawDisk::NewL(*this, aLocDrvCaps);
+iRawDisk=CRawDisk::NewL(*this, aLocDrvCaps);
 iRawDisk->InitializeL();
 //========== create FAT table object
-	delete iFatTable;
+delete iFatTable;
-	iFatTable=CFatTable::NewL(*this, aLocDrvCaps);
+iFatTable=CFatTable::NewL(*this, aLocDrvCaps);
 //========== create and setup leaf direcotry cache if cache limit is set bigger than one
-	const TUint32 cacheLimit = iFatConfig.LeafDirCacheSize();
+const TUint32 cacheLimit = iFatConfig.LeafDirCacheSize();
-	if (cacheLimit > 1)
+if (cacheLimit > 1)
-		{
+{
-		// destroy the old leaf dir cache to avoid memory leak.
+// destroy the old leaf dir cache to avoid memory leak.
-		delete iLeafDirCache;
+delete iLeafDirCache;
-		iLeafDirCache = CLeafDirCache::NewL(cacheLimit);
+iLeafDirCache = CLeafDirCache::NewL(cacheLimit);
-		}
+}
-	else
+else
-		{
+{
-		iLeafDirCache = NULL;
+iLeafDirCache = NULL;
-		}
+}
 //==========  find out free clusters number on the volume
 FAT().CountFreeClustersL();
 SetState(EInit_R);  //-- the state is "Initialized, but not writen"
 //-- make a callback, telling FileServer about free space discovered.
 const TInt64 freeSpace = ((TInt64)FAT().NumberOfFreeClusters()) << ClusterSizeLog2();
 SetDiskSpaceChange(freeSpace);
 __PRINT3(_L("#- CFatMountCB::InitializeL() done. drv:%d, Free clusters:%d, 1st Free cluster:%d"),DriveNumber(), FAT().NumberOfFreeClusters(), FAT().FreeClusterHint());
-	}
+}
 //-------------------------------------------------------------------------------------------------------------------
 @param aCluster Cluster to check
 @return Result of test
 */
 TBool CFatMountCB::IsEndOfClusterCh(TInt aCluster) const
-	{
+{
-	if(Is16BitFat())
+if(Is16BitFat())
-		return(aCluster>=0xFFF8 && aCluster<=0xFFFF);
+return(aCluster>=0xFFF8 && aCluster<=0xFFFF);
-	else
+else
-		return(aCluster>=0xFF8 && aCluster<=0xFFF);
+return(aCluster>=0xFF8 && aCluster<=0xFFF);
-	}
+}
 /**
 Set a cluster to the end of cluster chain marker
 @param aCluster cluster to set to end of chain marker
 */
 void CFatMountCB::SetEndOfClusterCh(TInt &aCluster) const
-	{
+{
-	if(Is16BitFat())
+if(Is16BitFat())
-		aCluster=0xFFF8;
+aCluster=0xFFF8;
-	else
+else
-		aCluster=0xFF8;
+aCluster=0xFF8;
-	}
+}
 /**
 Initialize data to represent the root directory
 @param anEntry Entry to initialise
 */
 void CFatMountCB::InitializeRootEntry(TFatDirEntry & anEntry) const
-	{
+{
-	anEntry.SetName(_L8("ROOT"));
+anEntry.SetName(_L8("ROOT"));
-	anEntry.SetAttributes(KEntryAttDir);
+anEntry.SetAttributes(KEntryAttDir);
-	anEntry.SetStartCluster(0);
+anEntry.SetStartCluster(0);
-	}
+}
 /**
 Implementation of CMountCB::FileSystemSubType(). Retrieves the sub type of Fat file system
 and returns the name as a descriptor.
 @param aName Name of the sub type of Fat file system
 @return KErrNone if successful; KErrArgument if aName is not long enough; KErrNotReady if
-		the mount is not ready.
+the mount is not ready.
 @see CMountCB::FileSystemSubType()
 */
 TInt CFatMountCB::SubType(TDes& aName) const
-	{
+{
-	if(aName.MaxLength() < 5)
+if(aName.MaxLength() < 5)
-		return KErrArgument;
+return KErrArgument;
-	switch (iFatType)
+switch (iFatType)
-		{
+{
-		case EFat12:
+case EFat12:
-			{
+{
-			aName = KFSSubType_FAT12;
+aName = KFSSubType_FAT12;
-			return KErrNone;
+return KErrNone;
-			}
+}
-		case EFat16:
+case EFat16:
-			{
+{
-			aName = KFSSubType_FAT16;
+aName = KFSSubType_FAT16;
-			return KErrNone;
+return KErrNone;
-			}
+}
-		default:
+default:
-		// case EInvalidFatType
+// case EInvalidFatType
-			return KErrNotReady;
+return KErrNotReady;
-		}
+}
-	}
+}
 //-------------------------------------------------------------------------------------------------------------------
 /**
 CFatMountCB control method.
 @param  aLevel  specifies the operation to perfrom on the mount
 if (iRamDrive)
 return KErrNotSupported;
 else
 return LocalDrive()->LocalBufferSupport();
-		case EGetProxyDrive:
+case EGetProxyDrive:
-			((CProxyDrive*&)aInterface) = LocalDrive();
+((CProxyDrive*&)aInterface) = LocalDrive();
-			return KErrNone;
+return KErrNone;
 default:
 return(CMountCB::GetInterface(aInterfaceId, aInterface, aInput));
 }
 }

changeset 15	4122176ea935
parent 0	a41df078684a