--- a/baseapitest/basesvs/FileSystemPlugins/group/T_TestFSY1.mmp	Mon Oct 18 15:31:10 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-
-
-TARGET			T_TESTFSY1.fsy
-TARGETTYPE		fsy
-UID				0x100039df 0x200041C3
-VENDORID 		0x70000001
-
-CAPABILITY		TCB ProtServ DiskAdmin AllFiles PowerMgmt CommDD
-
-SOURCEPATH		../src
-
-SOURCE			T_TestFSY.cpp
-SOURCE			T_TestFSY1.cpp
-
-USERINCLUDE		../inc
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-LIBRARY			euser.lib
-LIBRARY			efile.lib
-SMPSAFE

--- a/baseapitest/basesvs/FileSystemPlugins/group/T_TestFXT.mmp	Mon Oct 18 15:31:10 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-
-
-TARGET			T_TestFXT.fxt
-TARGETTYPE		fsy
-UID				0x100039df 0x200041C2
-VENDORID 		0x70000001
-
-CAPABILITY 		TCB ProtServ DiskAdmin AllFiles PowerMgmt CommDD
-
-SOURCEPATH		../src
-SOURCE			T_TestFXT.cpp
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-LIBRARY			euser.lib
-LIBRARY			efile.lib
-
-SMPSAFE

--- a/baseapitest/basesvs/FileSystemPlugins/group/bld.inf	Mon Oct 18 15:31:10 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-//
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description: 
-//
-//
-
-PRJ_PLATFORMS
-
-PRJ_TESTMMPFILES
-T_TestFXT.mmp
-T_TestFSY1.mmp

--- a/baseapitest/basesvs/FileSystemPlugins/inc/T_TestFSY.h	Mon Oct 18 15:31:10 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,107 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-
-/**
-@test
-@internalComponent
-
-This contains CTestFileSystem
-*/
-
-#if (!defined __T_TEST_FSY_H__)
-#define __T_TEST_FSY_H__
-
-//	EPOC includes
-#include <f32fsys.h>
-
-class CTestMountCB : public CMountCB
-	{
-public:
-	CTestMountCB() {}
-	~CTestMountCB() {}
-	virtual void	MountL(TBool /*aForceMount*/) {}
-	virtual TInt	ReMount() { return KErrNone; }
-	virtual void	Dismounted() {}
-	virtual void	VolumeL(TVolumeInfo& /*aVolume*/) const {}
-	virtual void	SetVolumeL(TDes& /*aName*/) {}
-	virtual void	MkDirL(const TDesC& /*aName*/) {}
-	virtual void	RmDirL(const TDesC& /*aName*/) {}
-	virtual void	DeleteL(const TDesC& /*aName*/) {}
-	virtual void	RenameL(const TDesC& /*anOldName*/,const TDesC& /*anNewName*/) {}
-	virtual void	ReplaceL(const TDesC& /*anOldName*/,const TDesC& /*anNewName*/) {}
-	virtual void	EntryL(const TDesC& /*aName*/,TEntry& /*anEntry*/) const {}
-	virtual void	SetEntryL(const TDesC& /*aName*/,const TTime& /*aTime*/,TUint /*aSetAttMask*/,TUint /*aClearAttMask*/) {}
-	virtual void	FileOpenL(const TDesC& /*aName*/,TUint /*aMode*/,TFileOpen /*anOpen*/,CFileCB* /*aFile*/) {}
-	virtual void	DirOpenL(const TDesC& /*aName*/,CDirCB* /*aDir*/) {}
-	virtual void	RawReadL(TInt64 /*aPos*/,TInt /*aLength*/,const TAny* /*aTrg*/,TInt /*anOffset*/,const RMessagePtr2& /*aMessage*/) const {}
-	virtual void	RawWriteL(TInt64 /*aPos*/,TInt /*aLength*/,const TAny* /*aSrc*/,TInt /*anOffset*/,const RMessagePtr2& /*aMessage*/) {}
-	virtual void	ReadUidL(const TDesC& /*aName*/,TEntry& /*anEntry*/) const {}
-	virtual void	GetShortNameL(const TDesC& /*aLongName*/,TDes& /*aShortName*/) {}
-	virtual void	GetLongNameL(const TDesC& /*aShortName*/,TDes& /*aLongName*/) {}
-	virtual void	IsFileInRom(const TDesC& /*aFileName*/,TUint8*& /*aFileStart*/) {}
-	virtual void	ReadSectionL(const TDesC& /*aName*/,TInt /*aPos*/,TAny* /*aTrg*/,TInt /*aLength*/,const RMessagePtr2& /*aMessage*/) {}
-	};
-
-class CTestFileCB : public CFileCB
-	{
-public:
-	CTestFileCB() {}
-	~CTestFileCB() {}
-	virtual void	RenameL(const TDesC& /*aNewName*/) {}
-	virtual void	ReadL(TInt /*aPos*/,TInt& /*aLength*/,const TAny* /*aDes*/,const RMessagePtr2& /*aMessage*/) {}
-	virtual void	WriteL(TInt /*aPos*/,TInt& /*aLength*/,const TAny* /*aDes*/,const RMessagePtr2& /*aMessage*/) {}
-	virtual TInt	Address(TInt& /*aPos*/) const {return 0;}
-	virtual void	SetSizeL(TInt /*aSize*/) {}
-	virtual void	SetEntryL(const TTime& /*aTime*/,TUint /*aSetAttMask*/,TUint /*aClearAttMask*/) {}
-	virtual void	FlushDataL() {}
-	virtual void	FlushAllL() {}
-	virtual void	CheckPos(TInt /*aPos*/) {}
-	};
-
-class CTestDirCB : public CDirCB
-	{
-public:
-	CTestDirCB() {}
-	~CTestDirCB() {}
-	virtual void	ReadL(TEntry& /*anEntry*/) {}
-	};
-
-class CTestFormatCB : public CFormatCB
-	{
-public:
-	CTestFormatCB() {}
-	~CTestFormatCB() {}
-	virtual void	DoFormatStepL() {}
-	};
-
-class CTestFileSystem : public CFileSystem
-	{
-public:
-	TInt			DefaultPath(TDes& aPath) const;
-	void			DriveInfo(TDriveInfo& anInfo, TInt aDriveNumber) const;
-	TBusLocalDrive&	DriveNumberToLocalDrive(TInt aDriveNumber) const;
-	CMountCB*		NewMountL() const;
-	CFileCB*		NewFileL() const;
-	CDirCB*			NewDirL() const;
-	CFormatCB*		NewFormatL() const;
- 
-protected:
-	CTestFileSystem();
-	};
-
-#endif /* __T_TEST_FSY_H__ */

--- a/baseapitest/basesvs/FileSystemPlugins/inc/T_TestFSY1.h	Mon Oct 18 15:31:10 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-
-/**
-@test
-@internalComponent
-
-This contains CTestFileSystem1
-*/
-
-#if (!defined __T_TEST_FSY1_H__)
-#define __T_TEST_FSY1_H__
-
-//	User includes
-#include "T_TestFSY.h"
-
-class CTestFileSystem1 : public CTestFileSystem
-	{
-public:
-	static CFileSystem* NewL();
-
-	TInt	Install();
-	TBool	IsExtensionSupported() const;
-
-protected:
-	CTestFileSystem1();
-	};
-
-#endif /* __T_TEST_FSY2_H__ */

--- a/baseapitest/basesvs/FileSystemPlugins/src/T_TestFSY.cpp	Mon Oct 18 15:31:10 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-
-#include "T_TestFSY.h"
-
-/*@{*/
-_LIT(KDefaultPath,		"C:\\");
-/*@}*/
-
-CTestFileSystem::CTestFileSystem()
-//
-// Constructor
-//
-	{
-	}
-
-CMountCB* CTestFileSystem::NewMountL() const
-//
-// Create a new mount control block
-//
-	{
-	return (new(ELeave) CTestMountCB);
-	}
-
-CFileCB* CTestFileSystem::NewFileL() const
-//
-// Create a new file
-//
-	{
-	return (new(ELeave) CTestFileCB);
-	}
-
-CDirCB* CTestFileSystem::NewDirL() const
-//
-// create a new directory lister
-//
-	{
-	return (new(ELeave) CTestDirCB);
-	}
-
-CFormatCB* CTestFileSystem::NewFormatL() const
-//
-// Create a new media formatter
-//
-	{
-	return (new(ELeave) CTestFormatCB);
-	}
-
-TInt CTestFileSystem::DefaultPath(TDes& aPath) const
-//
-// Return the intial default path
-//
-	{
-	aPath=KDefaultPath;
-	return KErrNone;
-	}
-
-void CTestFileSystem::DriveInfo(TDriveInfo& anInfo,TInt aDriveNumber) const
-//
-// Return drive info - iDriveAtt and iBatteryState are already set
-//
-	{
-	TLocalDriveCapsV2Buf	localDriveCaps;
-	DriveNumberToLocalDrive(aDriveNumber).Caps(localDriveCaps);
-	anInfo.iMediaAtt=localDriveCaps().iMediaAtt;
-	anInfo.iType=localDriveCaps().iType;
-	anInfo.iDriveAtt=localDriveCaps().iDriveAtt;
-	}
-
-TBusLocalDrive& CTestFileSystem::DriveNumberToLocalDrive(TInt aDriveNumber) const
-//
-// Return the local drive associated with aDriveNumber
-//
-	{
-	return(GetLocalDrive(aDriveNumber));
-	}

--- a/baseapitest/basesvs/FileSystemPlugins/src/T_TestFSY1.cpp	Mon Oct 18 15:31:10 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-
-#include "T_TestFSY1.h"
-
-//	EPOC includes
-#include <f32ver.h>
-
-/*@{*/
-_LIT(KFileSystemName,	"TestFileSystem1");
-
-const TInt	KMajorVersionNumber=1;
-const TInt	KMinorVersionNumber=0;
-/*@}*/
-
-CFileSystem* CTestFileSystem1::NewL()
-//
-// Return File System
-//
-	{
-	return (new (ELeave) CTestFileSystem1);
-	}
-
-CTestFileSystem1::CTestFileSystem1()
-//
-// Constructor
-//
-	{
-	}
-
-TInt CTestFileSystem1::Install()
-//
-// Install the file system
-//
-	{
-	iVersion=TVersion(KMajorVersionNumber, KMinorVersionNumber, KF32BuildVersionNumber);
-	return(SetName(&KFileSystemName));
-	}
-TBool CTestFileSystem1::IsExtensionSupported() const
-//
-//	Return false to disallow mount extension on this file system
-//
-	{
-	return EFalse;
-	}
-
-extern "C" {
-
-EXPORT_C CFileSystem* CreateFileSystem()
-//
-// Create a new file system
-//
-	{
-	return(CTestFileSystem1::NewL());
-	}
-}

--- a/baseapitest/basesvs/FileSystemPlugins/src/T_TestFXT.cpp	Mon Oct 18 15:31:10 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-
-#include <f32fsys.h>
-
-
-class CEmptyExtProxyDrive : public CBaseExtProxyDrive
-	{
-public:
-	static CEmptyExtProxyDrive* NewL(CProxyDrive* aProxyDrive, CMountCB* aMount);
-	~CEmptyExtProxyDrive();
-
-private:
-	CEmptyExtProxyDrive(CProxyDrive* aProxyDrive, CMountCB* aMount);
-	};
-
-class CEmptyProxyDriveFactory : public CProxyDriveFactory
-	{
-public:
-	CEmptyProxyDriveFactory();
-	virtual TInt Install();
-	virtual CProxyDrive* NewProxyDriveL(CProxyDrive* aProxy,CMountCB* aMount);
-	};
-
-CEmptyExtProxyDrive* CEmptyExtProxyDrive::NewL(CProxyDrive* aProxyDrive, CMountCB* aMount)
-	{
-	CEmptyExtProxyDrive* temp=new(ELeave) CEmptyExtProxyDrive(aProxyDrive,aMount);
-	return(temp);
-	}
-
-
-CEmptyExtProxyDrive::CEmptyExtProxyDrive(CProxyDrive* aProxyDrive, CMountCB* aMount):CBaseExtProxyDrive(aProxyDrive,aMount)
-	{
-	}
-
-CEmptyExtProxyDrive::~CEmptyExtProxyDrive()
-	{
-	}
-
-CEmptyProxyDriveFactory::CEmptyProxyDriveFactory()
-	{
-	}
-
-TInt CEmptyProxyDriveFactory::Install()
-	{
-	_LIT(KEmptyName,"TestFileExtension");
-	return(SetName(&KEmptyName));
-	}
-
-CProxyDrive* CEmptyProxyDriveFactory::NewProxyDriveL(CProxyDrive* aProxy,CMountCB* aMount)
-	{
-	return(CEmptyExtProxyDrive::NewL(aProxy,aMount));
-	}
-
-extern "C" {
-
-EXPORT_C CProxyDriveFactory* CreateFileSystem()
-//
-// Create a new file system
-//
-	{
-	return(new CEmptyProxyDriveFactory());
-	}
-}

--- a/baseapitest/basesvs/common/inc/DataWrapperBase.h	Mon Oct 18 15:31:10 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-
-
-#if (!defined __DATA_WRAPPER_BASE__)
-#define __DATA_WRAPPER_BASE__
-
-//	EPOC includes
-#include <test/datawrapper.h>
-
-class CDataWrapperBase : public CDataWrapper
-	{
-public:
-	virtual ~CDataWrapperBase();
-
-	TBool	GetBoolFromConfig(const TDesC& aSectName,const TDesC& aKeyName,TBool& aResult);
-	TBool	GetIntFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TInt& aResult);
-	TBool   GetInt64FromConfig(const TDesC& aSectName, const TDesC& aKeyName, TInt64& aResult);
-	TBool	GetStringFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TPtrC& aResult);
-	TBool	GetHexFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TInt& aResult);
-	virtual void	InitialiseL();
-
-protected:
-	CDataWrapperBase();
-
-	TBool	GetCommandStringParameter(const TDesC& aParameterName, const TDesC& aSection, TPtrC& aResult, TText8 *aFileName, TInt aLine, TBool aMandatory);
-	TBool	GetCommandIntParameter(const TDesC& aParameterName, const TDesC& aSection, TInt& aResult, TText8 *aFileName, TInt aLine, TBool aMandatory);
-	TBool	GetCommandInt64Parameter(const TDesC& aParameterName, const TDesC& aSection, TInt64& aResult, TText8 *aFileName, TInt aLine, TBool aMandatory);
-	TBool	GetCommandBoolParameter(const TDesC& aParameterName, const TDesC& aSection, TBool& aResult, TText8 *aFileName, TInt aLine, TBool aMandatory);
-
-private:
-	TBool	GetCommandStringParameterL(const TDesC& aSectName, const TDesC& aKeyName, TPtrC& aResult);
-
-private:
-	// Included ini files
-	RPointerArray<CIniData>	iInclude;
-	RPointerArray<HBufC>	iBuffer;
-	};
-
-#endif /* __DATA_WRAPPER_BASE__ */

--- a/baseapitest/basesvs/common/inc/FileserverUtil.h	Mon Oct 18 15:31:10 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-
-
-#if (!defined __FILESERVERUTIL_H__)
-#define __FILESERVERUTIL_H__
-
-
-//	EPOC Includes
-#include <test/datawrapper.h>
-
-/** 
-@publishedAll
-@released
-
-Template class CleanupResetAndDestroy to clean up the array
-of implementation information from the cleanup stack.
-*/
-
-template <class T>
-class CleanupResetAndDestroy
-	{
-public:
-	/**
-	Puts an item on the cleanup stack.
-
-	@param  aRef 
-	        The implementation information to be put on the cleanup stack.
-	*/
-	inline static void PushL(T& aRef);
-private:
-	static void ResetAndDestroy(TAny *aPtr);
-	};
-template <class T>
-inline void CleanupResetAndDestroyPushL(T& aRef);
-template <class T>
-inline void CleanupResetAndDestroy<T>::PushL(T& aRef)
-	{CleanupStack::PushL(TCleanupItem(&ResetAndDestroy,&aRef));}
-template <class T>
-void CleanupResetAndDestroy<T>::ResetAndDestroy(TAny *aPtr)
-	{(STATIC_CAST(T*,aPtr))->ResetAndDestroy();}
-template <class T>
-inline void CleanupResetAndDestroyPushL(T& aRef)
-	{CleanupResetAndDestroy<T>::PushL(aRef);}
-
-class FileserverUtil
-	{
-public:
-
-	static TBool 		GetAttMask(CDataWrapper& aDataWrapper, const TDesC& aSection, const TDesC& aParameterName, TUint& aAttMask);
-	static TBool		VerifyTEntryDataFromIniL(CDataWrapper& aDataWrapper, const TDesC& aSection, TEntry& aEntry);
-	static TBool		VerifyTVolumeInfoDataFromIniL(CDataWrapper& aDataWrapper, const TDesC& aSection, TVolumeInfo& aVolumeInfo);
-	
-private:
-	static TBool 		ConvertToAttMask(const TDesC& aAttMaskStr, TUint& aAttMask);
-	};
-
-#endif /* __FILESERVERUTIL_H__ */

--- a/baseapitest/basesvs/common/inc/TestStepV2.h	Mon Oct 18 15:31:10 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-
-
-#if (!defined __TEST_STEP_V2_H__)
-#define __TEST_STEP_V2_H__
-
-//	EPOC includes
-#include <test/testexecutestepbase.h>
-
-class CTestStepV2 : public CTestStep
-	{
-public:
-	TBool	GetBoolFromConfig(const TDesC& aSectName,const TDesC& aKeyName,TBool& aResult);
-	TBool	GetIntFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TInt& aResult);
-	TBool	GetStringFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TPtrC& aResult);
-	TBool	GetHexFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TInt& aResult);
-
-protected:
-	CTestStepV2();
-	virtual ~CTestStepV2();
-
-	virtual enum TVerdict	doTestStepPreambleL();
-
-private:
-	TBool	GetCommandStringParameterL(const TDesC& aSectName, const TDesC& aKeyName, TPtrC& aResult);
-
-private:
-	// Included ini files
-	RPointerArray<CIniData>	iInclude;
-	RPointerArray<HBufC>	iBuffer;
-	};
-
-#endif /* __TEST_STEP_V2_H__ */

--- a/baseapitest/basesvs/common/src/DataWrapperBase.cpp	Mon Oct 18 15:31:10 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,284 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-
-#include "DataWrapperBase.h"
-
-/*@{*/
-///	Constant Literals used.
-_LIT(KIncludeSection,		"include");
-_LIT(KFile,					"file%d");
-_LIT(KMatch,				"*{*,*}*");
-_LIT(KStart,				"{");
-_LIT(KSeparator,			",");
-_LIT(KEnd,					"}");
-_LIT(KDataRead,				"INI READ : %S %S %S");
-/*@}*/
-
-CDataWrapperBase::CDataWrapperBase()
-:	CDataWrapper()
-	{
-	}
-
-CDataWrapperBase::~CDataWrapperBase()
-/**
- * Public destructor
- */
-	{
-	iInclude.ResetAndDestroy();
-	iBuffer.ResetAndDestroy();
-	}
-
-void CDataWrapperBase::InitialiseL()
-	{
-	CDataWrapper::InitialiseL();
-
-	TBuf<KMaxTestExecuteCommandLength>	tempStore;
-	TPtrC		fileName;
-	TBool		moreData=ETrue;
-	TBool		index=0;
-	while ( moreData )
-		{
-		tempStore.Format(KFile(), ++index);
-		moreData=GetStringFromConfig(KIncludeSection, tempStore, fileName);
-		
-		if (moreData)
-			{
-			CIniData*	iniData=CIniData::NewL(fileName);
-			CleanupStack::PushL(iniData);
-			iInclude.Append(iniData);
-			CleanupStack::Pop(iniData);
-			}
-		}
-	}
-
-TBool CDataWrapperBase::GetBoolFromConfig(const TDesC& aSectName,const TDesC& aKeyName,TBool& aResult)
-	{
-	TBool	ret=EFalse;
-	TPtrC	result;
-	TRAPD(err, ret=GetCommandStringParameterL(aSectName, aKeyName, result));
-	if ( err != KErrNone )
-		{
-		ret=EFalse;
-		}
-	if ( ret )
-		{
-		_LIT(KTrue,"true");
-		aResult=(result.FindF(KTrue) != KErrNotFound);
-		}
-
-	return ret;
-	}
-
-TBool CDataWrapperBase::GetIntFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TInt& aResult)
-	{
-	TPtrC	result;
-	TBool	ret=EFalse;
-	TRAPD(err, ret=GetCommandStringParameterL(aSectName, aKeyName, result));
-	if ( err != KErrNone )
-		{
-		ret=EFalse;
-		}
-	if ( ret )
-		{
-		TLex	lex(result);
-		ret=(lex.Val(aResult)==KErrNone);
-		}
-
-	return ret;
-	}
-
-TBool CDataWrapperBase::GetInt64FromConfig(const TDesC& aSectName, const TDesC& aKeyName, TInt64& aResult)
-     {
-     TPtrC     result;
-     TBool     ret=EFalse;
-     TRAPD(err, ret=GetCommandStringParameterL(aSectName, aKeyName, result));
-     if ( err != KErrNone )
-          {
-          ret=EFalse;
-          }
-     if ( ret )
-          {
-          TLex     lex(result);
-          ret=(lex.Val(aResult)==KErrNone);
-          }
-
-     return ret;
-     }
-
-TBool CDataWrapperBase::GetStringFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TPtrC& aResult)
-	{
-	TBool	ret=EFalse;
-	TRAPD(err, ret=GetCommandStringParameterL(aSectName, aKeyName, aResult));
-	if ( err != KErrNone )
-		{
-		ret=EFalse;
-		}
-	return ret;
-	}
-
-TBool CDataWrapperBase::GetHexFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TInt& aResult)
-	{
-	TPtrC	result;
-	TBool	ret=EFalse;
-	TRAPD(err, ret=GetCommandStringParameterL(aSectName, aKeyName, result));
-	if ( err != KErrNone )
-		{
-		ret=EFalse;
-		}
-	if ( ret )
-		{
-		TLex	lex(result);
-		ret=(lex.Val((TUint &)aResult, EHex)==KErrNone);
-		}
-
-	return ret;
-	}
-
-TBool CDataWrapperBase::GetCommandStringParameterL(const TDesC& aSectName, const TDesC& aKeyName, TPtrC& aResult)
-	{
-	TBool	ret=EFalse;
-
-	if ( aSectName.Length()!=0 )
-		{
-		ret=CDataWrapper::GetStringFromConfig(aSectName, aKeyName, aResult);
-
-		for ( TInt index=iInclude.Count(); (index>0) && (!ret); )
-			{
-			ret=iInclude[--index]->FindVar(aSectName, aKeyName, aResult);
-			}
-		}
-
-	if ( ret )
-		{
-		if ( aResult.Match(KMatch)!=KErrNotFound )
-			{
-			//	We have an entry of the format
-			//	entry =*{section,entry}*
-			//	where * is one or more characters
-			//	We need to construct this from other data in the ini file replacing {*,*}
-			//	with the data from
-			//	[section]
-			//	entry =some_value
-			HBufC*	buffer=HBufC::NewLC(aResult.Length());
-			buffer->Des().Copy(aResult);
-
-			TInt	startLength=KStart().Length();
-			TInt	sparatorLength=KSeparator().Length();
-			TInt	endLength=KEnd().Length();
-			TInt	bufferLength;
-			TInt	start;
-			TInt	sparator;
-			TInt	end;
-			TPtrC	remaining;
-			TLex	lex;
-			do
-				{
-				bufferLength=buffer->Length();
-				start=buffer->Find(KStart);
-
-				remaining.Set(buffer->Des().Right(bufferLength-start-startLength));
-				sparator=remaining.Find(KSeparator);
-				remaining.Set(remaining.Right(remaining.Length()-sparator-sparatorLength));
-				sparator += (start + startLength);
-
-				end=remaining.Find(KEnd) + sparator + sparatorLength;
-
-				TPtrC	sectionName(buffer->Ptr()+start+startLength, sparator-start-startLength);
-				TPtrC	keyName(buffer->Ptr()+sparator+sparatorLength, end-sparator-sparatorLength);
-				sectionName.Set(TLex(sectionName).NextToken());
-				keyName.Set(TLex(keyName).NextToken());
-
-				TInt	entrySize=0;
-				TPtrC	entryData;
-				TBool	found=CDataWrapper::GetStringFromConfig(sectionName, keyName, entryData);
-				for ( TInt index=iInclude.Count(); (index>0) && (!found);  )
-					{
-					found=iInclude[--index]->FindVar(sectionName, keyName, entryData);
-					}
-				if ( found )
-					{
-					entrySize=entryData.Length();
-					}
-
-				TInt	newLength=start + bufferLength - end - endLength + entrySize;
-				HBufC*	bufferNew=HBufC::NewLC(newLength);
-				bufferNew->Des().Copy(buffer->Ptr(), start);
-				if ( entrySize>0 )
-					{
-					bufferNew->Des().Append(entryData);
-					}
-				bufferNew->Des().Append(buffer->Ptr() + end + endLength, bufferLength - end - endLength);
-				CleanupStack::Pop(bufferNew);
-				CleanupStack::PopAndDestroy(buffer);
-				buffer=bufferNew;
-				CleanupStack::PushL(buffer);
-				}
-			while ( buffer->Match(KMatch)!=KErrNotFound );
-			iBuffer.Append(buffer);
-			CleanupStack::Pop(buffer);
-			aResult.Set(*buffer);
-			INFO_PRINTF4(KDataRead, &aSectName, &aKeyName , &aResult);
-			}
-		}
-
-	return ret;
-	}
-
-TBool CDataWrapperBase::GetCommandStringParameter(const TDesC& aParameterName, const TDesC& aSection, TPtrC& aResult, TText8 *aFileName, TInt aLine, TBool aMandatory)
-	{
-	TBool	ret = GetStringFromConfig(aSection, aParameterName, aResult);
-	if (aMandatory && !ret)
-		{
-		Logger().LogExtra(aFileName, aLine, ESevrErr, _L("No %S"), &aParameterName);
-		SetBlockResult(EFail);
-		}
-	return ret;
-	}
-
-TBool CDataWrapperBase::GetCommandIntParameter(const TDesC& aParameterName, const TDesC& aSection, TInt& aResult, TText8* aFileName, TInt aLine, TBool aMandatory)
-	{
-	TBool	ret = GetIntFromConfig(aSection, aParameterName, aResult);
-	if (aMandatory && !ret)
-		{
-		Logger().LogExtra(aFileName, aLine, ESevrErr, _L("No %S"), &aParameterName);
-		SetBlockResult(EFail);
-		}
-	return ret;
-	}
-	
-TBool CDataWrapperBase::GetCommandInt64Parameter(const TDesC& aParameterName, const TDesC& aSection, TInt64& aResult, TText8* aFileName, TInt aLine, TBool aMandatory)
-	{
-	TBool	ret = GetInt64FromConfig(aSection, aParameterName, aResult);
-	if (aMandatory && !ret)
-		{
-		Logger().LogExtra(aFileName, aLine, ESevrErr, _L("No %S"), &aParameterName);
-		SetBlockResult(EFail);
-		}
-	return ret;
-	}
-
-TBool CDataWrapperBase::GetCommandBoolParameter(const TDesC& aParameterName, const TDesC& aSection, TBool& aResult, TText8 *aFileName, TInt aLine, TBool aMandatory)
-	{
-	TBool	ret = GetBoolFromConfig(aSection, aParameterName, aResult);
-	if (aMandatory && !ret)
-		{
-		Logger().LogExtra(aFileName, aLine, ESevrErr, _L("No %S"), &aParameterName);
-		SetBlockResult(EFail);
-		}
-	return ret;
-	}

--- a/baseapitest/basesvs/common/src/FileserverUtil.cpp	Mon Oct 18 15:31:10 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,407 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-
-#include "FileserverUtil.h"
-
-/**
- * @enum Constant Literals used.
- */
- 
-/*@{*/
-
-// Parameters
-_LIT( KExpectedName,					"expectedName" );
-_LIT( KExpectedSize,					"expectedSize" );
-_LIT( KExpectedTime,					"expectedTime" );
-_LIT( KExpectedUid1,					"expectedUid1" );
-_LIT( KExpectedUid2,					"expectedUid2" );
-_LIT( KExpectedUid3,					"expectedUid3" );
-_LIT( KVolumeLabel,						"volume_label" );
-_LIT( KVolumeSize,						"volume_size");
-_LIT( KVolumeFreeSpace,					"volume_free_space" );
-_LIT( KVolumeUniqueID,					"volume_unique_id");
-_LIT( KExpectedMostDerivedUid,			"expectedMostDerivedUid" );
-_LIT( KVolumeFileCacheFlags,			"volume_File_Cache_Flags" );
-_LIT( KFileCacheReadEnabled,			"EFileCacheReadEnabled" );
-_LIT( KFileCacheReadOn,					"EFileCacheReadOn");
-_LIT( KFileCacheReadAheadEnabled,		"EFileCacheReadAheadEnabled" );
-_LIT( KFileCacheReadAheadOn,			"EFileCacheReadAheadOn" );
-_LIT( KFileCacheWriteEnabled,			"EFileCacheWriteEnabled" );
-_LIT( KFileCacheWriteOn,				"EFileCacheWriteOn" );
-
-// Attributes
-_LIT(KEntryAttNormalStr, 				"KEntryAttNormal");
-_LIT(KEntryAttReadOnlyStr, 				"KEntryAttReadOnly");
-_LIT(KEntryAttHiddenStr, 				"KEntryAttHidden");
-_LIT(KEntryAttSystemStr, 				"KEntryAttSystem");
-_LIT(KEntryAttVolumeStr,				"KEntryAttVolume");
-_LIT(KEntryAttDirStr, 					"KEntryAttDir");
-_LIT(KEntryAttArchiveStr, 				"KEntryAttArchive");
-_LIT(KEntryAttXIPStr, 					"KEntryAttXIP");
-#if (!defined(__Symbian_OS_v9_1__))
-_LIT(KEntryAttRemoteStr, 				"KEntryAttRemote");
-_LIT(KEntryAttMaskFileSystemSpecificStr,"KEntryAttMaskFileSystemSpecific");
-#endif
-_LIT(KEntryAttMatchMaskStr,				"KEntryAttMatchMask");
-_LIT(KEntryAttMaskSupportedStr,			"KEntryAttMaskSupported");
-_LIT(KEntryAttMatchExclusiveStr,		"KEntryAttMatchExclusive");
-_LIT(KEntryAttMatchExcludeStr,			"KEntryAttMatchExclude");
-_LIT(KEntryAttAllowUidStr,				"KEntryAttAllowUid");
-
-// constants
-const TInt KUid1Index 					= 0;
-const TInt KUid2Index 					= 1;
-const TInt KUid3Index 					= 2;
-
-const TInt KTimeFormatSize 				= 30;
-_LIT( KTimeFormat,						"%D%M%Y%/0%1%/1%2%/2%3%/3 %-B%:0%J%:1%T%:2%S%:3%+B" );
-
-/*@}*/
-
-
-
-TBool FileserverUtil::VerifyTEntryDataFromIniL(CDataWrapper& aDataWrapper, const TDesC& aSection, TEntry& aEntry)
-	{
-	TBool ret = ETrue; 
-
-	aDataWrapper.INFO_PRINTF2(_L("Entry name = %S"), &aEntry.iName );				
-		
-	TPtrC expectedStr;
-	if ( aDataWrapper.GetStringFromConfig(aSection, KExpectedName(), expectedStr) )
-		{
-		if (aEntry.iName.CompareC(expectedStr, 0, NULL) != 0)
-			{
-			aDataWrapper.ERR_PRINTF3(_L("%S != %S"), &aEntry.iName, &expectedStr);
-			ret = EFalse;
-			}
-		else
-			{
-			aDataWrapper.INFO_PRINTF3(_L("%S == %S"), &aEntry.iName, &expectedStr);
-			}
-		}
-			
-	TInt expectedInt = 0;
-	if ( aDataWrapper.GetIntFromConfig(aSection, KExpectedSize(), expectedInt) )
-		{
-		aDataWrapper.INFO_PRINTF2(_L("Entry size = %d"), aEntry.iSize );
-		if (aEntry.iSize != expectedInt)
-			{
-			aDataWrapper.ERR_PRINTF3(_L("Size from ini file not equal with size returned from function (%d != %d)"), expectedInt, aEntry.iSize);
-			ret = EFalse;
-			}
-		}
-	
-	if ( aDataWrapper.GetStringFromConfig(aSection, KExpectedTime(), expectedStr) )
-		{			
-		TBuf<KTimeFormatSize>	dateString;
-		aEntry.iModified.FormatL(dateString, KTimeFormat);
-		aDataWrapper.INFO_PRINTF2(_L("Entry modified %S"), &dateString);
-		
-		TTime	modificationTime;
-		User::LeaveIfError(modificationTime.Set(expectedStr));
-		
-		if (aEntry.iModified != modificationTime)
-			{
-			aDataWrapper.ERR_PRINTF1(_L("Time from ini file not equal with time returned from function."));
-			ret = EFalse;
-			}
-		}
-	
-	if ( aDataWrapper.GetIntFromConfig(aSection, KExpectedUid1(), expectedInt) )
-		{
-		TInt uid1 = aEntry.iType[KUid1Index].iUid;	
-		aDataWrapper.INFO_PRINTF2(_L("Entry UID1 = %d"), uid1 );
-
-		if ( uid1 != expectedInt )
-			{
-			aDataWrapper.ERR_PRINTF3(_L("Entry UID1 %d  !=  ini UID1 %d)"), uid1, expectedInt);
-			ret = EFalse;
-			}
-		}
-		
-	if ( aDataWrapper.GetIntFromConfig(aSection, KExpectedUid2(), expectedInt) )
-		{
-		TInt uid2 = aEntry.iType[KUid2Index].iUid;
-		aDataWrapper.INFO_PRINTF2(_L("Entry UID2 = %d"), uid2 );
-
-		if ( uid2 != expectedInt )
-			{
-			aDataWrapper.ERR_PRINTF3(_L("Entry UID2 %d  !=  ini UID1 %d)"), uid2, expectedInt);
-			ret = EFalse;
-			}
-		}
-		
-	if ( aDataWrapper.GetIntFromConfig(aSection, KExpectedUid3(), expectedInt) )
-		{
-		TInt uid3 = aEntry.iType[KUid3Index].iUid;
-		aDataWrapper.INFO_PRINTF2(_L("Entry UID3 = %d"), uid3 );
-		
-		if ( uid3 != expectedInt )
-			{
-			aDataWrapper.ERR_PRINTF3(_L("Entry UID3 %d  !=  ini UID3 %d)"), uid3, expectedInt);
-			ret = EFalse;
-			}
-		}
-		
-	if ( aDataWrapper.GetIntFromConfig(aSection, KExpectedMostDerivedUid(), expectedInt) )
-		{
-		TInt mostDerivedUid = aEntry.MostDerivedUid().iUid;
-		aDataWrapper.INFO_PRINTF2(_L("MostDerivedUid = %d"), mostDerivedUid);
-
-		if ( mostDerivedUid != expectedInt )
-			{
-			aDataWrapper.ERR_PRINTF3(_L("Entry MostDerivedUid %d  !=  ini MostDerivedUid %d)"), mostDerivedUid, expectedInt);
-			ret = EFalse;
-			}
-		}
-	
-
-	return ret;
-	}
-
-
-
-TBool FileserverUtil::VerifyTVolumeInfoDataFromIniL(CDataWrapper& aDataWrapper, const TDesC& aSection, TVolumeInfo& aVolumeInfo)
-	{
-	TBool ret = ETrue; 
-
-	//Get volume name from config.
-	TPtrC	volumeLabel;
-	if (aDataWrapper.GetStringFromConfig(aSection, KVolumeLabel(), volumeLabel))
-		{
-		//Checking that name of volume is equal to passed through config file.
-		if (aVolumeInfo.iName.CompareC(volumeLabel, 0, NULL) != 0)
-			{
-			aDataWrapper.ERR_PRINTF1(_L("Volume name from ini file not equal with volume name returned from function"));
-			ret = EFalse;
-			}
-		}
-	
-	TInt	tmp;
-	if (aDataWrapper.GetIntFromConfig(aSection, KVolumeSize(), tmp))
-		{
-		TInt64	volumeSize;
-		volumeSize = tmp;
-		//Checking that size of volume is equal to passed through config file.
-		if (volumeSize != aVolumeInfo.iSize)
-			{
-			aDataWrapper.ERR_PRINTF1(_L("Volume size from ini file not equal with volume size returned from function"));
-			ret = EFalse;
-			}
-		}
-
-	if (aDataWrapper.GetIntFromConfig(aSection, KVolumeFreeSpace(), tmp))
-		{
-		TInt64	freeSpace;
-		freeSpace = tmp;
-		//Checking that free space of volume is equal to passed through config file.
-		if (freeSpace != aVolumeInfo.iFree)
-			{
-			aDataWrapper.ERR_PRINTF1(_L("Volume free space amount from ini file not equal with volume free space amount returned from function"));
-			ret = EFalse;
-			}
-		}
-
-	if (aDataWrapper.GetIntFromConfig(aSection, KVolumeUniqueID(), tmp))
-		{
-		if(tmp<0)
-			{
-			aDataWrapper.ERR_PRINTF1(_L("ID in config should be not less than 0 "));
-			ret = EFalse;
-			}
-		else
-			{
-			TUint	volumeUniqueID;
-			volumeUniqueID = (TUint)tmp;
-			//Checking that Unique ID of volume is equal to passed through config file.
-			if (volumeUniqueID != aVolumeInfo.iUniqueID)
-				{
-				aDataWrapper.ERR_PRINTF1(_L("Volume unique ID from ini file not equal with volume unique ID returned from function"));
-				ret = EFalse;
-				}
-			}
-		}
-
-	TPtrC volumeFileCacheFlags;		
-	if (aDataWrapper.GetStringFromConfig(aSection, KVolumeFileCacheFlags(), volumeFileCacheFlags))
-		{
-		TFileCacheFlags tmpFileCacheFlags;
-		if(volumeFileCacheFlags == KFileCacheReadEnabled())
-			{
-			tmpFileCacheFlags = EFileCacheReadEnabled;
-			}
-		else if(volumeFileCacheFlags == KFileCacheReadOn())
-			{
-			tmpFileCacheFlags = EFileCacheReadOn;
-			}
-		else if(volumeFileCacheFlags == KFileCacheReadAheadEnabled())
-			{
-			tmpFileCacheFlags = EFileCacheReadAheadEnabled;
-			}
-		else if(volumeFileCacheFlags == KFileCacheReadAheadOn())
-			{
-			tmpFileCacheFlags = EFileCacheReadAheadOn;
-			}
-		else if(volumeFileCacheFlags == KFileCacheWriteEnabled())
-			{
-			tmpFileCacheFlags = EFileCacheWriteEnabled;
-			}
-		else if(volumeFileCacheFlags == KFileCacheWriteOn())
-			{
-			tmpFileCacheFlags = EFileCacheWriteOn;
-			}
-		else
-			{
-			aDataWrapper.ERR_PRINTF1(_L("Volume file cache flags from ini file not equal with volume file cache flags returned from function"));
-			ret = EFalse;
-			}
-			
-		if(ret && (aVolumeInfo.iFileCacheFlags != tmpFileCacheFlags))
-			{
-			aDataWrapper.ERR_PRINTF1(_L("Volume file cache flags from ini file not equal with volume file cache flags returned from function"));
-			ret = EFalse;
-			}
-		}
-	return ret;
-	}
-	
-	
-	
-TBool FileserverUtil::GetAttMask(CDataWrapper& aDataWrapper, const TDesC& aSection, const TDesC& aParameterName, TUint& aAttMask)
-	{
-	TPtrC	iniAttMaskStr;
-	TBool	ret = aDataWrapper.GetStringFromConfig(aSection, aParameterName, iniAttMaskStr);
-	if ( ret )
-		{
-		if ( !ConvertToAttMask(iniAttMaskStr, aAttMask) )
-			{
-			TInt	intTemp;
-			ret = aDataWrapper.GetIntFromConfig(aSection, aParameterName, intTemp);
-			if ( ret )
-				{
-				aAttMask = intTemp;
-				}
-			}
-		}
-
-	return ret;
-	}
-
-
-
-TBool FileserverUtil::ConvertToAttMask(const TDesC& aAttMaskStr, TUint& aAttMask)
-	{
-	TBool ret = ETrue;
-
-	if (aAttMaskStr == KEntryAttNormalStr)
-		{
-		aAttMask = KEntryAttNormal;
-		}
-	else if (aAttMaskStr == KEntryAttReadOnlyStr)
-		{
-		aAttMask = KEntryAttReadOnly;
-		}
-	else if (aAttMaskStr == KEntryAttHiddenStr)
-		{
-		aAttMask = KEntryAttHidden;
-		}
-	else if (aAttMaskStr == KEntryAttSystemStr)
-		{
-		aAttMask = KEntryAttSystem;
-		}
-	else if (aAttMaskStr == KEntryAttVolumeStr)
-		{
-		aAttMask = KEntryAttVolume;
-		}
-	else if (aAttMaskStr == KEntryAttDirStr)
-		{
-		aAttMask = KEntryAttDir;
-		}
-	else if (aAttMaskStr == KEntryAttArchiveStr)
-		{
-		aAttMask = KEntryAttArchive;
-		}
-	else if (aAttMaskStr == KEntryAttXIPStr)
-		{
-		aAttMask = KEntryAttXIP;
-		}
-#if (!defined(__Symbian_OS_v9_1__))
-	else if (aAttMaskStr == KEntryAttRemoteStr)
-		{
-		aAttMask = KEntryAttRemote;
-		}
-	else if (aAttMaskStr == KEntryAttMaskFileSystemSpecificStr)
-		{
-		aAttMask = KEntryAttMaskFileSystemSpecific;
-		}
-#endif
-	else if (aAttMaskStr == KEntryAttMatchMaskStr)
-		{
-		aAttMask = KEntryAttMatchMask;
-		}
-	else if (aAttMaskStr == KEntryAttMaskSupportedStr)
-		{
-		aAttMask = KEntryAttMaskSupported;
-		}
-	else if (aAttMaskStr == KEntryAttMatchExclusiveStr)
-		{
-		aAttMask = KEntryAttMatchExclusive;
-		}
-	else if (aAttMaskStr == KEntryAttMatchExcludeStr)
-		{
-		aAttMask = KEntryAttMatchExclude;
-		}
-	else if (aAttMaskStr == KEntryAttAllowUidStr)
-		{
-		aAttMask = KEntryAttAllowUid;
-		}
-	else if (aAttMaskStr.Match((_L("*|*"))) != KErrNotFound)
-		{
-		TUint	tmpAttMask;
-
-		TInt	location = aAttMaskStr.Match(_L("*|*"));
-		//Converting Left part of the data
-		TPtrC	left = aAttMaskStr.Left(location);
-		if (ConvertToAttMask(left, tmpAttMask))
-			{
-			aAttMask = tmpAttMask;
-			}
-		else
-			{
-			ret = EFalse;
-			}
-
-		//Converting right data can be with another "|"
-		TPtrC	right = aAttMaskStr.Mid(location + 1);
-		if (ConvertToAttMask(right, tmpAttMask))
-			{
-			aAttMask = aAttMask | tmpAttMask;
-			}
-		else
-			{
-			ret = EFalse;
-			}
-		}
-	else
-		{
-		ret = EFalse;
-		}
-
-	return ret;
-	}
-

--- a/baseapitest/basesvs/common/src/TestStepV2.cpp	Mon Oct 18 15:31:10 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,214 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-
-#include "TestStepV2.h"
-
-/*@{*/
-///	Constant Literals used.
-_LIT(KIncludeSection,		"include");
-_LIT(KFile,					"file%d");
-_LIT(KMatch,				"*{*,*}*");
-_LIT(KStart,				"{");
-_LIT(KSeparator,			",");
-_LIT(KEnd,					"}");
-_LIT(KDataRead,				"INI READ : %S %S %S");
-/*@}*/
-
-CTestStepV2::CTestStepV2()
-:	CTestStep()
-	{
-	}
-
-CTestStepV2::~CTestStepV2()
-	{
-	iInclude.ResetAndDestroy();
-	iBuffer.ResetAndDestroy();
-	}
-
-enum TVerdict CTestStepV2::doTestStepPreambleL()
-	{
-	TBuf<KMaxTestExecuteCommandLength>	tempStore;
-
-	TVerdict	ret=CTestStep::doTestStepPreambleL();
-	TPtrC		fileName;
-	TBool		moreData=ETrue;
-	TBool		index=0;
-	while ( moreData )
-		{
-		tempStore.Format(KFile(), ++index);
-		moreData=GetStringFromConfig(KIncludeSection, tempStore, fileName);
-		if ( moreData )
-			{
-			CIniData*	iniData=CIniData::NewL(fileName);
-			CleanupStack::PushL(iniData);
-			iInclude.Append(iniData);
-			CleanupStack::Pop(iniData);
-			}
-		}
-
-	return ret;
-	}
-
-TBool CTestStepV2::GetBoolFromConfig(const TDesC& aSectName,const TDesC& aKeyName,TBool& aResult)
-	{
-	TPtrC	result;
-	TBool	ret=EFalse;
-	TRAPD(err, ret=GetCommandStringParameterL(aSectName, aKeyName, result));
-	if ( err != KErrNone )
-		{
-		ret=EFalse;
-		}
-	if ( ret )
-		{
-		_LIT(KTrue,"true");
-		aResult=(result.FindF(KTrue) != KErrNotFound);
-		}
-	return ret;
-	}
-
-TBool CTestStepV2::GetIntFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TInt& aResult)
-	{
-	TPtrC	result;
-	TBool	ret=EFalse;
-	TRAPD(err, ret=GetCommandStringParameterL(aSectName, aKeyName, result));
-	if ( err != KErrNone )
-		{
-		ret=EFalse;
-		}
-	if ( ret )
-		{
-		TLex	lex(result);
-		ret=(lex.Val(aResult)==KErrNone);
-		}
-
-	return ret;
-	}
-
-TBool CTestStepV2::GetStringFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TPtrC& aResult)
-	{
-	TBool	ret=EFalse;
-	TRAPD(err, ret=GetCommandStringParameterL(aSectName, aKeyName, aResult));
-	if ( err != KErrNone )
-		{
-		ret=EFalse;
-		}
-	return ret;
-	}
-
-TBool CTestStepV2::GetHexFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TInt& aResult)
-	{
-	TPtrC	result;
-	TBool	ret=EFalse;
-	TRAPD(err, ret=GetCommandStringParameterL(aSectName, aKeyName, result));
-	if ( err != KErrNone )
-		{
-		ret=EFalse;
-		}
-	if ( ret )
-		{
-		TLex	lex(result);
-		ret=(lex.Val((TUint &)aResult, EHex)==KErrNone);
-		}
-
-	return ret;
-	}
-
-TBool CTestStepV2::GetCommandStringParameterL(const TDesC& aSectName, const TDesC& aKeyName, TPtrC& aResult)
-	{
-	TBool	ret=CTestStep::GetStringFromConfig(aSectName, aKeyName, aResult);
-
-	for ( TInt index=iInclude.Count(); (index>0) && (!ret);  )
-		{
-		ret=iInclude[--index]->FindVar(aSectName, aKeyName, aResult);
-		}
-
-	if ( ret )
-		{
-		if ( aResult.Match(KMatch)!=KErrNotFound )
-			{
-			//	We have an entry of the format
-			//	entry =*{section,entry}*
-			//	where * is one or more characters
-			//	We need to construct this from other data in the ini file replacing {*,*}
-			//	with the data from
-			//	[section]
-			//	entry =some_value
-			HBufC*	buffer=HBufC::NewLC(aResult.Length());
-			buffer->Des().Copy(aResult);
-
-			TInt	startLength=KStart().Length();
-			TInt	sparatorLength=KSeparator().Length();
-			TInt	endLength=KEnd().Length();
-			TInt	bufferLength;
-			TInt	start;
-			TInt	sparator;
-			TInt	end;
-			TPtrC	remaining;
-			TLex	lex;
-			do
-				{
-				bufferLength=buffer->Length();
-				start=buffer->Find(KStart);
-
-				remaining.Set(buffer->Des().Right(bufferLength-start-startLength));
-				sparator=remaining.Find(KSeparator);
-				remaining.Set(remaining.Right(remaining.Length()-sparator-sparatorLength));
-				sparator += (start + startLength);
-
-				end=remaining.Find(KEnd) + sparator + sparatorLength;
-
-				TPtrC	sectionName(buffer->Ptr()+start+startLength, sparator-start-startLength);
-				TPtrC	keyName(buffer->Ptr()+sparator+sparatorLength, end-sparator-sparatorLength);
-				sectionName.Set(TLex(sectionName).NextToken());
-				keyName.Set(TLex(keyName).NextToken());
-
-				TInt	entrySize=0;
-				TPtrC	entryData;
-				TBool	found=CTestStep::GetStringFromConfig(sectionName, keyName, entryData);
-				for ( TInt index=iInclude.Count(); (index>0) && (!found);  )
-					{
-					found=iInclude[--index]->FindVar(sectionName, keyName, entryData);
-					}
-				if ( found )
-					{
-					entrySize=entryData.Length();
-					}
-
-				TInt	newLength=start + bufferLength - end - endLength + entrySize;
-				HBufC*	bufferNew=HBufC::NewLC(newLength);
-				bufferNew->Des().Copy(buffer->Ptr(), start);
-				if ( entrySize>0 )
-					{
-					bufferNew->Des().Append(entryData);
-					}
-				bufferNew->Des().Append(buffer->Ptr() + end + endLength, bufferLength - end - endLength);
-				CleanupStack::Pop(bufferNew);
-				CleanupStack::PopAndDestroy(buffer);
-				buffer=bufferNew;
-				CleanupStack::PushL(buffer);
-				}
-			while ( buffer->Match(KMatch)!=KErrNotFound );
-			iBuffer.Append(buffer);
-			CleanupStack::Pop(buffer);
-			aResult.Set(*buffer);
-			INFO_PRINTF4(KDataRead, &aSectName, &aKeyName , &aResult);
-			}
-		}
-
-	return ret;
-	}

--- a/baseapitest/basesvs/config/t_base.tcs	Mon Oct 18 15:31:10 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-

--- a/baseapitest/basesvs/conformance/f32/fat32/group/bld.inf	Mon Oct 18 15:31:10 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-//
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description: 
-//
-//
-
-PRJ_TESTEXPORTS
-
-../scripts/f32-fat32-conformance.script				z:/base/conformance/f32/fat32/f32-fat32-conformance.script
-
-../testdata/winscw/f32-fat32-conformance.ini		/epoc32/release/winscw/udeb/z/base/conformance/f32/fat32/f32-fat32-conformance.ini
-../testdata/winscw/f32-fat32-conformance.ini		/epoc32/release/winscw/urel/z/base/conformance/f32/fat32/f32-fat32-conformance.ini
-../testdata/armv5/f32-fat32-conformance.ini			/epoc32/data/z/base/conformance/f32/fat32/f32-fat32-conformance.ini
-
-//pkg
-
-../pkg/t_fat32.pkg									/epoc32/pkg/t_fat32.pkg
-../pkg/tfat32.bat									/epoc32/pkg/tfat32.bat
-
-../scripts/f32-fat32-conformance.script				/epoc32/pkg/conformance/f32/fat32/f32-fat32-conformance.script
-
-../testdata/armv5/f32-fat32-conformance.ini			/epoc32/pkg/conformance/f32/fat32/f32-fat32-conformance.ini
-
-./t_base_f32_fat32.iby								/epoc32/rom/include/t_base_f32_fat32.iby
-
-PRJ_TESTMMPFILES
-t_fat32.mmp

--- a/baseapitest/basesvs/conformance/f32/fat32/group/t_base_f32_fat32.iby	Mon Oct 18 15:31:10 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-//
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description: 
-//
-//
-
-#ifndef __T_BASE_F32_FAT32_IBY__
-#define __T_BASE_F32_FAT32_IBY__
-
-#include <testexecute.iby>
-
-data=EPOCROOT##epoc32\data\Z\base\conformance\f32\fat32\f32-fat32-conformance.script 			base\conformance\f32\fat32\f32-fat32-conformance.script		 	
-data=EPOCROOT##epoc32\data\Z\base\conformance\f32\fat32\f32-fat32-conformance.ini 			base\conformance\f32\fat32\f32-fat32-conformance.ini 
-
-#if (!defined EKA2)
-file=ABI_DIR\BUILD_DIR\t_fat32server.exe		system\libs\t_fat32server.exe	
-#else
-file=ABI_DIR\BUILD_DIR\t_fat32server.exe	 	system\bin\t_fat32server.exe	
-#endif
-
-#endif

--- a/baseapitest/basesvs/conformance/f32/fat32/group/t_fat32.mmp	Mon Oct 18 15:31:10 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-
-
-
-TARGET      	t_fat32server.exe
-TARGETTYPE  	exe
-UID             0x1000007A 0x10281824
-VENDORID 		0x70000001
-EPOCHEAPSIZE	0x1000 0x02000000
-EPOCSTACKSIZE 	0x8000
-
-
-CAPABILITY		ALL
-
-SOURCEPATH  	../src
-SOURCE			t_fat32server.cpp 
-SOURCE			t_fat32base.cpp
-SOURCE			t_fat32format.cpp
-SOURCE			t_fat32mount.cpp
-SOURCE			t_fat32readraw.cpp
-SOURCE			t_fat32writeraw.cpp
-SOURCE			t_fat32readfile.cpp
-SOURCE			t_fat32writefile.cpp
-SOURCE			t_fat32checkdisk.cpp
-SOURCE			t_fat32calculate.cpp
-SOURCE			t_fat32filldisk.cpp
-SOURCE			t_fat32clusterbound.cpp
-SOURCE			t_fat32readwrite.cpp
-SOURCE			t_fat32larger512.cpp
-
-USERINCLUDE   	../inc
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-LIBRARY     	euser.lib
-LIBRARY			efsrv.lib
-LIBRARY			testexecuteutils.lib
-LIBRARY			testexecutelogclient.lib
-LIBRARY			hal.lib
-SMPSAFE
-
-

--- a/baseapitest/basesvs/conformance/f32/fat32/inc/basetedefs.h	Mon Oct 18 15:31:10 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-
-
-
-#ifndef BASETEDEFS_H
-#define BASETEDEFS_H
-
-#define DO_TEST(COND)     				CarryOutTest((COND),((TText8*)__FILE__), __LINE__)
-#define DO_TEST2(PTR,COND)				(PTR)->CarryOutTest((COND),((TText8*)__FILE__), __LINE__)
-#define DO_TEST3(THREAD,PTR,COND)		(PTR)->CarryOutTest((THREAD),(COND),((TText8*)__FILE__), __LINE__)
-
-#define INFO_PRINTF8(p1, p2, p3, p4, p5, p6, p7, p8)	Logger().LogExtra(((TText8*)__FILE__), __LINE__, ESevrInfo, (p1), (p2), (p3), (p4), (p5), (p6), (p7), (p8))
-
-
-//define DO_TEST(COND, ERR_NUM)	if((COND)!=true){User::Panic(KBaseTestTAct,(ERR_NUM));}
-
-#define DO_PRINTF1(PTEST,P1)						(PTEST)->INFO_PRINTF1((P1))
-#define DO_PRINTF2(PTEST,P1,P2)						(PTEST)->INFO_PRINTF2((P1),(P2))
-#define DO_PRINTF3(PTEST,P1,P2,P3)					(PTEST)->INFO_PRINTF3((P1),(P2),(P3))
-#define DO_PRINTF4(PTEST,P1,P2,P3,P4)				(PTEST)->INFO_PRINTF4((P1),(P2),(P3),(P4))
-#define DO_PRINTF5(PTEST,P1,P2,P3,P4,P5)			(PTEST)->INFO_PRINTF5((P1),(P2),(P3),(P4),(P5))
-#define DO_PRINTF6(PTEST,P1,P2,P3,P4,P5,P6)			(PTEST)->INFO_PRINTF6((P1),(P2),(P3),(P4),(P5),(P6))
-#define DO_PRINTF7(PTEST,P1,P2,P3,P4,P5,P6,P7)		(PTEST)->INFO_PRINTF7((P1),(P2),(P3),(P4),(P5),(P6),(P7))
-#define DO_PRINTF8(PTEST,P1,P2,P3,P4,P5,P6,P7,P8)	(PTEST)->INFO_PRINTF8((P1),(P2),(P3),(P4),(P5),(P6),(P7),(P8))
-
-#define DO_THREAD_PRINTF1(PTEST,P1)   \
-					{\
-						RCriticalSection * pSection = (PTEST)->ReturnCritical();\
-						if (pSection) pSection->Wait();\
-						(PTEST)->INFO_PRINTF1((P1));\
-						if (pSection) pSection->Signal();\
-					}
-						
-
-
-#endif

--- a/baseapitest/basesvs/conformance/f32/fat32/inc/sl_bpb1.h	Mon Oct 18 15:31:10 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,243 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-
-
-#ifndef SL_BPB1_H
-#define SL_BPB1_H
-
-#include <f32fsys.h>
-#include <f32ver.h>
-#include <f32dbg.h>
-#include <e32svr.h>
-
-#pragma warning (disable:4103) //  : used #pragma pack to change alignment
-
-static const TInt KFatDirNameSize=11;
-static const TInt KFatDirReservedSize=10;
-static const TInt KVolumeLabelSize=11;
-static const TInt KFileSysTypeSize=8;
-static const TInt KVendorIdSize=8;
-static const TInt KVFatEntryAttribute=0x0F;
-static const TInt KBootSectorSignature=0xAA55;
-
-class TFatDirEntry;
-enum TFault
-	{
-	EVFatNoLongName,
-	EFatChkDskFailed,
-	EFatBadParameter,
-	EFatCacheBadRead,
-	EFatCacheNotFatSector,
-	EFatBadLocalDrive,
-	EFatBadBootSectorParameter,
-	EFatBadDirEntryParameter,
-	EFatAddClusterNotLastInList,
-	EFatBadEntryValue,
-	EFatBadClusterValue,
-	EFatBadStdFormatName,
-	EFatBadDosFormatName,
-	EFatCorrupt,
-	EFatChkDskBitListOverFlow,
-	EFatChkDskIndexOverFlow,
-	EFatChkDskIllegalClusterNumber,
-	EFatChkDskClusterAlreadyInUse,
-	EFatChkDskBadCluster,
-	EFatChkDskInvalidEntrySize,
-	EFatDesTooBig,
-	EFatFilePosBeyondEnd,
-	EFatFileSeekIndexTooSmall,
-	EFatFileSeekIndexTooSmall2,
-	EFatDataAllocBadSeg,
-	EFatFileSystemBadMemory,
-	EFatFileSystemCreate1,
-	EFatFileSystemCreate2,
-	EFatFileSystemCreate3,
-	ECacheAllocatorSetMax,
-	EFatLruCacheBadGranularity,
-	EFatFixedCacheBadGranularity,
-	EFatFixedCacheBadCall,
-	EFatRawReadTooBig,
-	EFatRawWriteTooBig,
-	EWinsBadRamDriveRead,
-	EWinsBadRamDriveWrite,
-	EFatReadUidFailed,
-	ELruCacheFlushNotSupported
-	};
-
-struct SFatDirEntry
-	{
-    TUint8 iName[KFatDirNameSize];
-    TUint8 iAttributes;
-    TUint8 iReserved[KFatDirReservedSize];
-    TUint16 iTime;
-    TUint16 iDate;
-    TUint16 iStartCluster;
-    TUint32 iSize;
-	};	
-#define pDir ((SFatDirEntry*)&iData[0])
-
-//
-typedef TBuf8<KFatDirNameSize> TShortName;
-//
-const TInt KSizeOfFatBootSector=62;
-const TInt KSizeOfFatDirEntry=32;
-class TFatBootSector
-	{
-public:
-	inline const TPtrC8 VendorId() const;
-	inline TInt BytesPerSector() const{return iBytesPerSector;}
-	inline TInt SectorsPerCluster() const{return iSectorsPerCluster;}
-	inline TInt ReservedSectors() const {return iReservedSectors;};
-	inline TInt NumberOfFats() const {return iNumberOfFats;}
-	inline TInt RootDirEntries() const{return iRootDirEntries;}
-	inline TInt TotalSectors() const{return iTotalSectors;}
-	inline TUint8 MediaDescriptor() const {return iMediaDescriptor;}
-	inline TInt FatSectors() const {return iFatSectors;}
-	inline TInt SectorsPerTrack() const {return iSectorsPerTrack;}
-	inline TInt NumberOfHeads() const{return iNumberOfHeads;}
-	inline TInt HiddenSectors() const {return iHiddenSectors;}
-	inline TInt HugeSectors() const{return iHugeSectors;}
-	inline TInt PhysicalDriveNumber() const;
-	inline TInt ExtendedBootSignature() const;
-	inline TUint32 UniqueID() const;
-	inline const TPtrC8 VolumeLabel() const;
-	inline const TPtrC8 FileSysType() const {return TPtrC8(iFileSysType,KFileSysTypeSize);}
-	inline TInt BootSectorSignature() const;
-	inline void SetJumpInstruction();
-	inline void SetVendorID(const TDesC8& aDes);
-	inline void SetBytesPerSector(TInt aBytesPerSector);
-	inline void SetSectorsPerCluster(TInt aSectorsPerCluster);
-	inline void SetReservedSectors(TInt aReservedSectors);
-	inline void SetNumberOfFats(TInt aNumberOfFats);
-	inline void SetRootDirEntries(TInt aRootDirEntries);
-	inline void SetTotalSectors(TInt aTotalSectors);
-	inline void SetMediaDescriptor(TUint8 aMediaDescriptor);
-	inline void SetFatSectors(TInt aFatSectors);
-	inline void SetSectorsPerTrack(TInt aSectorsPerTrack);
-	inline void SetNumberOfHeads(TInt aNumberOfHeads);
-	inline void SetHiddenSectors(TUint32 aHiddenSectors);
-	inline void SetHugeSectors(TUint32 aTotalSectors);
-	inline void SetPhysicalDriveNumber(TInt aPhysicalDriveNumber);
-	inline void SetReservedByte(TUint8 aReservedByte);
-	inline void SetExtendedBootSignature(TInt anExtendedBootSignature);
-	inline void SetUniqueID(TUint32 anUniqueID);
-	inline void SetVolumeLabel(const TDesC8& aDes);
-	inline void SetFileSysType(const TDesC8& aDes);
-	
-public:
-	inline TBool Is16BitFat() {return(FileSysType()==_L8("FAT16   "));}
-	TInt FirstFatSectorPos()
-	{
-	return(ReservedSectors()*BytesPerSector());
-	}
-	inline TInt RootDirStartSector();
-	inline TInt FirstFreeSector();
-public:
-    TUint8  iJumpInstruction[3];        ///< Jump instruction used for bootable volumes
-    TUint8  iVendorId[KVendorIdSize];   ///< Vendor ID of the file system that formatted the volume
-    TUint16 iBytesPerSector;            ///< Bytes per sector 
-    TUint8  iSectorsPerCluster;         ///< Sectors per cluster ratio
-    TUint16 iReservedSectors;           ///< Number of reserved sectors on the volume
-    TUint8  iNumberOfFats;              ///< Number of Fats on the volume
-    TUint16 iRootDirEntries;	        ///< Number of entries allowed in the root directory, specific to Fat12/16, zero for FAT32
-    TUint16 iTotalSectors;              ///< Total sectors on the volume, zero for FAT32
-    TUint8  iMediaDescriptor;           ///< Media descriptor
-    TUint16 iFatSectors;                ///< Sectors used for the Fat table, zero for FAT32
-    TUint16 iSectorsPerTrack;           ///< Sectors per track
-    TUint16 iNumberOfHeads;             ///< Number of heads 
-    TUint32 iHiddenSectors;             ///< Number of hidden sectors in the volume
-    TUint32 iHugeSectors;               ///< Total sectors in the volume, Used if totalSectors > 65535
-	TUint32	iFatSectors32;              ///< Start of additional elements @ offset 36 for FAT32, Sectors in Fat table for 32 bit volume
-	TUint16 iFATFlags;                  ///< Fat flags
-	TUint16	iVersionNumber;		        ///< Version number of the file system
-	TUint32 iRootClusterNum;            ///< Cluster number of the root directory
-	TUint16 iFSInfoSectorNum;           ///< Sector number containing the FSIInfo structure
-	TUint16 iBkBootRecSector;           ///< Backup boot sector
-	TUint8	iReserved2[12];             ///< Reserved space, End of Fat32 Only parameters section
-	TUint8  iPhysicalDriveNumber;       ///< Physical drive number, not used in  OS
-    TUint8  iReserved;                  ///< Reserved byte
-    TUint8  iExtendedBootSignature;     ///< Extended boot signiture
-    TUint32 iUniqueID;                  ///< Unique volume ID
-    TUint8  iVolumeLabel[KVolumeLabelSize];  ///< 	The volume's label
-	TUint8  iFileSysType[KFileSysTypeSize];  ///< 	File system type
-	};
-	
-void Fault(TAny* aTestStep,TFault anError);
-GLREF_C TBool IsPowerOfTwo(TInt aNum);
-GLREF_C TInt Log2(TInt aNum);
-GLREF_C TTime DosTimeToTTime(TInt aDosTime,TInt aDosDate);
-GLREF_C TInt DosTimeFromTTime(const TTime& aTime);
-GLREF_C TInt DosDateFromTTime(const TTime& aTime);
-
-class TFatDirEntry
-	{
-public:
-	const TPtrC8 Name() const
-	{return TPtrC8((TUint8*)&(pDir->iName),11);
-	}
-	TInt Attributes() const 
-	{
-	return pDir->iAttributes;
-	}
-	inline TTime Time() const;
-	TInt StartCluster() const
-	{
-	return pDir->iStartCluster;
-	}
-	inline TUint32 Size() const;
-	TBool IsErased() const
-	{
-	return (TBool)(iData[0]==0xe5);
-	}
-	inline TBool IsCurrentDirectory() const;
-	inline TBool IsParentDirectory() const;
-	TBool IsEndOfDirectory() const 
-	{
-	return (TBool)(iData[0]==0x00);
-	}
-	TBool IsGarbage() const;
-	inline void SetName(const TDesC8& aDes);
-	inline void SetAttributes(TInt anAtt);
-	inline void SetTime(const TTime& aTime);
-	void SetStartCluster(TInt aStartCluster)
-	{
-	__ASSERT_DEBUG(!(aStartCluster&~KMaxTUint16),Fault( this,EFatBadDirEntryParameter));
-	pDir->iStartCluster=(TUint16)aStartCluster;
-	}
-	inline void SetSize(TUint32 aFilesize);
-	inline void SetErased();
-	inline void SetCurrentDirectory();
-	inline void SetParentDirectory();
-	inline void SetEndOfDirectory();
-	inline void ZeroReserved();
-public:
-	void InitializeRootEntry();
-	void InitializeAsVFat(TUint8 aCheckSum);
-	void SetVFatEntry(const TDesC& aName,TInt aRemainderLen);
-	void ReadVFatEntry(TDes16& aVBuf);
-	inline TBool IsLongNameStart() const;
-	TBool IsVFatEntry() const 
-	{
-	return (TBool)(Attributes()==0x0F && IsEndOfDirectory()==EFalse);
-	}
-	inline TInt NumFollowing() const;
-public:
-	TUint8 iData[KSizeOfFatDirEntry];
-	};
-
-#endif // SL_BPB1_H

--- a/baseapitest/basesvs/conformance/f32/fat32/inc/t_fat32base.h	Mon Oct 18 15:31:10 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,113 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-
-
-#ifndef T_FAT32BASE_H
-#define T_FAT32BASE_H
-
-#include <test/testexecutestepbase.h>
-#include <test/testexecuteserverbase.h>
-
-enum TDiskType
-    {
-    EFat12,
-    EFat16,
-    EFat32,
-    EFatUnknown
-    };
-/*
- *temporary macro to dump the test result.
- *should be moved a common header file.
- */
-#define FAT_TEST(cond, text)	 				  	{\
-												if (cond) \
-													{ \
-													INFO_PRINTF1(text); \
-													INFO_PRINTF1(_L("...passed"));\
-													} \
-												else \
-													{ \
-													ERR_PRINTF1(text); \
-													ERR_PRINTF1(_L("...failed"));\
-													SetTestStepResult(EFail);\
-													return TestStepResult();\
-													}\
-												}
-
-#define FAT_TEST_VAL(cond, text, errval)	 				  	{\
-												if (cond) \
-													{ \
-													INFO_PRINTF1(text); \
-													INFO_PRINTF1(_L("...passed"));\
-													} \
-												else \
-													{ \
-													ERR_PRINTF1(text); \
-													ERR_PRINTF2(_L("...failed: %d "), errval);\
-													SetTestStepResult(EFail);\
-													return TestStepResult();\
-													}\
-												}
-/**
-Fat32 ReadRaw Class. Inherits from the CTestStep.
-Contains functions needed to set up all tests. 
-
-
-*/												
-class CBaseTestFat32Base : public CTestStep
-	{
-	public:
-		CBaseTestFat32Base();
-		~CBaseTestFat32Base();
-		virtual TVerdict doTestStepPreambleL();	
-		TBool IsFileSystemFAT(RFs &aFsSession,TInt aDrive);
-		TBool IsFileSystemFAT32();
-		void ParseCommandArguments(void);
-		TInt CBaseTestFat32Base::CurrentDrive();
-		TInt CheckSecPerClus();
-		TInt CalculateClusCount();		
-		TInt Convert(TInt aLen, TUint8 *aBuffer, TUint32 *aField);
-		TInt ReadField(TInt aLen, TInt aOffSet, TUint32 *aName);			
-		void CheckDebug();
-		
-//****KARTHIK RE-WORK*****	
-		TInt PosInBytes(TInt aFatIndex);	
-		TInt64 ClusterToByte(TInt aCluster);	
-		TInt64 getBytesPerCluster(TUint32 aSecPerClus);
-
-	public:
-
-		RFs iTheFs;					// The file server session
-		TFileName iSessionPath;		// The session path
-		TChar iDriveToTest;			// The drive to run the tests on
-		TUint32 iClusterCount;		// The cluster count of the volume
-		TUint32 iBPB_TotSec32;		// Value of the field BPB_TotSec32
-		TUint32 iBPB_BytsPerSec;   // Value of the field BPB_BytsPerSec
-		TUint32 iBPB_ResvdSecCnt;	// Value of the field BPB_ResvdSecCnt
-		TUint32 iBPB_NumFATs;		// Value of the field BPB_NumFATs
-		TUint32 iBPB_FATSz32;		// Value of the field BPB_FATSz32
-		TUint32 iBPB_SecPerClus;	// Value of the field BPB_SecPerClus
-		TInt64  iDiskSize;			// Size of the disk from TVolumeInfo
-		TInt64  iDriveSize;			// Size of the disk from the media driver
-		TInt 	iMedia;				// 0 for MMC, 1 for SD
-	
-};
-
-_LIT(KTestStepBase, "Base");
-
-#endif //T_FAT32BASE_H

--- a/baseapitest/basesvs/conformance/f32/fat32/inc/t_fat32calculate.h	Mon Oct 18 15:31:10 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-
-
-
-#ifndef T_FAT32CALCULATE_H
-#define T_FAT32CALCULATE_H
-
-#include <test/testexecutestepbase.h>
-#include <test/testexecuteserverbase.h>
-#include "t_fat32base.h"
-
-/**
-Fat32 Calculate Class. Inherits from the base class.
-Contains functions needed to perform the following calculations:
-	a) Setting the cluster count to a value greater than it actually is
-	b) Calculate the size of a FAT
-	c) Obtaining the cluster count of the volume
-*/
-class CBaseTestFat32Calculate : public CBaseTestFat32Base
-	{
-	public:
-		CBaseTestFat32Calculate();
-		~CBaseTestFat32Calculate();
-		virtual TVerdict doTestStepL();	
-		TInt Calculate(TInt64 aPos,TInt aValue);	
-		TInt SetToGreater(TUint32 aClusterCount, TInt aPos);
-		TInt ComputeFatSize();
-		TInt CheckClusterCount(TUint32 aClusterCount);	
-		TInt CheckFSInfo(TInt aPos);
-	protected:
-	
-	
-};
-
-_LIT(KTestStepCalculate, "Calculate");
-
-#endif // T_FAT32CALCULATE_H

--- a/baseapitest/basesvs/conformance/f32/fat32/inc/t_fat32checkdisk.h	Mon Oct 18 15:31:10 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-
-
-#ifndef T_FAT32CHECKDISK_H
-#define T_FAT32CHECKDISK_H
-
-#include <test/testexecutestepbase.h>
-#include <test/testexecuteserverbase.h>
-#include "t_fat32base.h"
-
-/**
-Fat32 CheckDisk Class. Inherits from the base class.
-Checks the integrity of the disk using RFs::CheckDisk() and 
-RFs::ScanDrive()
-*/
-class CBaseTestFat32CheckDisk : public CBaseTestFat32Base
-	{
-	public:
-		CBaseTestFat32CheckDisk();
-		~CBaseTestFat32CheckDisk();
-		virtual TVerdict doTestStepL();		
-	protected:
-	
-	
-};
-
-_LIT(KTestStepCheckDisk, "CheckDisk");
-
-#endif // T_FAT32CHECKDISK_H

--- a/baseapitest/basesvs/conformance/f32/fat32/inc/t_fat32clusterbound.h	Mon Oct 18 15:31:10 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-
-
-#ifndef T_FAT32CLUSTERBOUND_H
-#define T_FAT32CLUSTERBOUND_H
-
-
-#include "t_fat32base.h"
-#include <f32file.h>
-#include <e32math.h>
-
-
-/**
-Fat32 ClusterBound Class. Inherits from the base class.
-Contains functions needed in attempting to access outside the 
-bounds of the cluster range
-*/ 
-class CBaseTestFat32ClusterBound : public CBaseTestFat32Base
-	{
-	public:
-		CBaseTestFat32ClusterBound (); 
-		virtual  ~CBaseTestFat32ClusterBound ();
-		virtual TVerdict doTestStepL();	
-		TInt TestClusterBoundsWriteFile();
-		TInt TestClusterBoundsCreateFiles();
-		
-	protected:				
-};
-
-_LIT(KTestStepClusterBound, "ClusterBound");
-
-#endif // T_FAT32CLUSTERBOUND_H

--- a/baseapitest/basesvs/conformance/f32/fat32/inc/t_fat32filldisk.h	Mon Oct 18 15:31:10 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-
-#ifndef T_FAT32FILLDISK_H
-#define T_FAT32FILLDISK_H
-
-
-#include "t_fat32base.h"
-#include <f32file.h>
-#include <e32math.h>
-
-/**
-Fat32 FillDisk Class. Inherits from the base class.
-Fills the disk to its maxinmum capacity
-*/
-class CBaseTestFat32FillDisk : public CBaseTestFat32Base
-	{
-	public:
-		CBaseTestFat32FillDisk (); 
-		virtual  ~CBaseTestFat32FillDisk ();
-		virtual TVerdict doTestStepL();	
-					
-};
-
-_LIT(KTestStepFillDisk, "FillDisk");
-
-#endif // T_FAT32FILLDISK_H

--- a/baseapitest/basesvs/conformance/f32/fat32/inc/t_fat32format.h	Mon Oct 18 15:31:10 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-
-
-#ifndef T_FAT32FORMAT_H
-#define T_FAT32FORMAT_H
-
-#include <test/testexecutestepbase.h>
-#include <test/testexecuteserverbase.h>
-#include "t_fat32base.h"
-
-/**
-Fat32 Format Class. Inherits from the base class.
-Contains functions needed to format the disk when given the format type
-that is required and the drive to format.
-*/
-class CBaseTestFat32Format : public CBaseTestFat32Base
-	{
-	public:
-		CBaseTestFat32Format();
-		~CBaseTestFat32Format();
-		virtual TVerdict doTestStepL();	
-		TInt FormatFat(TDriveUnit aDrive, TPtrC16 aFormat);				
-	protected:
-	
-	
-};
-
-_LIT(KTestStepFormat, "Format");
-
-#endif // T_FAT32FORMAT_H