diff -r 96e5fb8b040d -r 36bfc973b146 kerneltest/f32test/testfsys/t_tfsys2.cpp --- a/kerneltest/f32test/testfsys/t_tfsys2.cpp Thu Dec 17 09:24:54 2009 +0200 +++ b/kerneltest/f32test/testfsys/t_tfsys2.cpp Thu Jan 07 13:38:45 2010 +0200 @@ -92,34 +92,10 @@ void CTestFileSystem::DriveInfo(TDriveInfo& anInfo,TInt aDriveNumber) const // -// Return drive info - iDriveAtt and iBatteryState are already set +// Return drive info // { - if(!IsValidLocalDriveMapping(aDriveNumber)) - return; - - TLocalDriveCapsV2Buf localDriveCaps; - - // is the drive local? - if (!IsProxyDrive(aDriveNumber)) - { - // if not valid local drive, use default values in localDriveCaps - // if valid local drive and not locked, use TBusLocalDrive::Caps() values - // if valid drive and locked, hard-code attributes - (void)GetLocalDrive(aDriveNumber).Caps(localDriveCaps); - } - else // this need to be made a bit nicer - { - CExtProxyDrive* pD = GetProxyDrive(aDriveNumber); - if(pD) - { - (void)pD->Caps(localDriveCaps); - } - } - - anInfo.iMediaAtt=localDriveCaps().iMediaAtt; - anInfo.iType=localDriveCaps().iType; - anInfo.iDriveAtt=localDriveCaps().iDriveAtt; + CFileSystem::DriveInfo(anInfo, aDriveNumber); // hijack the iBattery member to report back the number of times MountL() has been called anInfo.iBattery = (TBatteryState) iMountAttempts;