--- a/build.config.xml	Fri Jul 09 13:09:11 2010 +0100
+++ b/build.config.xml	Mon Aug 23 18:56:36 2010 +0100
@@ -130,17 +130,18 @@
   	<layer name="video_test_layer">
 			<module name="video_multimedia_test_component">
 				<unit name="mdfunittestcodecapi" unitID="sos.mdfunittestcodecapi" bldFile="&layer_real_source_path;/mmdevicefw/mdfunittest/codecapi/video/group" mrp=""/>
-				<unit name="mdfunittestcodecapiPU" unitID="sos.mdfunittestcodecapiPU" bldFile="&layer_real_source_path;/mmdevicefw/mdfunittest/codecapi/PU/video/group" mrp=""/>				
+				<unit name="mdfunittestcodecapiPU" unitID="sos.mdfunittestcodecapiPU" bldFile="&layer_real_source_path;/mmdevicefw/mdfunittest/codecapi/PU/video/group" mrp=""/>
+				<unit name="mdfunittestmain" unitID="sos.mdfunittestmain" bldFile="&layer_real_source_path;/mmdevicefw/mdfunittest/codecapi/codecapi/group" mrp=""/>				
 				<unit name="lib3gpunittest" unitID="sos.lib3gpunittest" bldFile="&layer_real_source_path;/mmplugins/lib3gpunittest/group" mrp=""/>				
 				<unit name="cameraunittest" unitID="sos.cameraunittest" bldFile="&layer_real_source_path;/imagingandcamerafws/cameraunittest/group" mrp=""/>				
+				<unit name="cameraplugin" unitID="sos.cameraplugin" bldFile="&layer_real_source_path;/mmplugins/cameraplugins/group" mrp=""/>
 				<unit name="VideoUnitTest" unitID="sos.VideoUnitTest" bldFile="&layer_real_source_path;/mmlibs/mmfw/tsrc/mmfunittest/group/VideoGroup" mrp=""/>
 				<unit name="xvidcore" unitID="sos.xvidcore" bldFile="sf\xvidhwdevice\group" mrp=""/>
 				<unit name="xvidpu" unitID="sos.xvidpu" bldFile="sf\xvidpu\group" mrp=""/>			
-				<!--unit name="dvbhreceiverhai" unitID="sos.dvbhreceiverhai" bldFile="&layer_real_source_path;/mmhais/dvbhreceiverhai/hai/dvbh/group" mrp=""/-->
-				<!--unit name="dvbhunittest" unitID="sos.dvbhunittest" bldFile="&layer_real_source_path;/mmhais/dvbhunittest/hai/dvbh/group" mrp=""/-->				
-				<!--unit name="mvsintegrationtest" unitID="sos.mvsintegrationtest" bldFile="&layer_real_source_path;/mmlibs/mmfw/tsrc/mmvalidationsuite/mvsintegrationtest/group" mrp=""/-->
 				<unit name="VideoIntegrationTest" unitID="sos.VideoIntegrationTest" bldFile="&layer_real_source_path;/mmlibs/mmfw/tsrc/mmfintegrationtest/group/VideoGroup" mrp=""/>				
-			</module>			
+				<unit name="mvsintegrationtest" unitID="sos.mvsintegrationtest" bldFile="&layer_real_source_path;/mmlibs/mmfw/tsrc/mmvalidationsuite/mvsintegrationtest/group" mrp=""/>
+				<unit name="mvsintegrationtestagnts" unitID="sos.mvsintegrationtestagnt" bldFile="&layer_real_source_path;/mmlibs/mmfw/tsrc/mmvalidationsuite/mmvalidationsuiteagents/group" mrp=""/>
+				</module>			
     </layer>   
   	<layer name="imaging_test_layer">
 			<module name="imaging_multimedia_test_component">

--- a/devsound/a3fcharacterisationtest/scripts/mm_a3f_devsound_play_tone_reference_hw.ini	Fri Jul 09 13:09:11 2010 +0100
+++ b/devsound/a3fcharacterisationtest/scripts/mm_a3f_devsound_play_tone_reference_hw.ini	Mon Aug 23 18:56:36 2010 +0100
@@ -118,7 +118,7 @@
 FrequencyTone1 = 440
 
 [MM-A3F-DEVSOUND-CHRTZ-TONE-0024]
-ExCapRate = 1
+ExCapRate = 4095
 ExCapChannels = 3
 
 [MM-A3F-DEVSOUND-CHRTZ-TONE-0025]
@@ -135,7 +135,7 @@
 [MM-A3F-DEVSOUND-CHRTZ-TONE-0028]
 Duration = 5
 FrequencyTone1 = 440
-ExCapRate = 1
+ExCapRate = 4095
 ExCapChannels = 3
 
 [MM-A3F-DEVSOUND-CHRTZ-TONE-0029]
@@ -157,7 +157,7 @@
 [MM-A3F-DEVSOUND-CHRTZ-TONE-0032]
 Duration = 5
 FrequencyTone1 = 440
-ExCapRate = 1
+ExCapRate = 4095
 ExCapChannels = 3
 
 [MM-A3F-DEVSOUND-CHRTZ-TONE-0033]

--- a/devsound/a3fcharacterisationtest/scripts/mm_a3f_devsound_record_raw_reference_hw.ini	Fri Jul 09 13:09:11 2010 +0100
+++ b/devsound/a3fcharacterisationtest/scripts/mm_a3f_devsound_record_raw_reference_hw.ini	Mon Aug 23 18:56:36 2010 +0100
@@ -100,7 +100,7 @@
 
 [MM-A3F-DEVSOUND-CHRTZ-REC-RAW-0022]
 ExCapChannels = 3
-ExCapRate = 127
+ExCapRate = 1663
 Duration = 2
 Filename = c:\char_a3f_devsound_test_data\record_22.raw
 FourccCode = P16

--- a/devsound/a3fcharacterisationtest/src/char_a3f_devsound_compliancesuiteconstants.h	Fri Jul 09 13:09:11 2010 +0100
+++ b/devsound/a3fcharacterisationtest/src/char_a3f_devsound_compliancesuiteconstants.h	Mon Aug 23 18:56:36 2010 +0100
@@ -108,7 +108,7 @@
 	EFsmIncorrectErrorPassed = 0,
 	EInvalidCallbackCall
 	};
-	
+
 // DevSound events
 enum TMmfDevSoundEvent
 	{
@@ -147,42 +147,59 @@
 	User::Panic(aCategory, aReason);
 	}
 
-const TUint8 KFixedSequenceTestSequenceDataX[]=
-    {
-    0x53, 0x51, 0x4E, 0x43, // HEADER
-    0xFE, 0xFF, // -2 STARTLOOP INDICATOR
-    0x0A, 0x00,  // Number of times that the sequence will be played
-    /* Tone Data constitutes the following:
-      ToneDur,    Freq1,      Vol1,       Freq2       Vol2
-    The sequence is arranged in blocks of 8 bits to represent 16 bit values, 
-   	which allows more dynamic range, frequency and time values.
-    The tag Low and High mean low and high byte block.
-    Low    Hi    Low   Hi   Low   Hi    Low   Hi    Low   Hi
-    */
-    0x64, 0x00, 0xB8, 0x01, 0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00,
-    0x64, 0x00, 0xD2, 0x01, 0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00,
-    0x64, 0x00, 0xEE, 0x01, 0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00,
-    0x64, 0x00, 0x0B, 0x02, 0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00,
-    0x64, 0x00, 0x2A, 0x02, 0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00,
-    0x64, 0x00, 0x4B, 0x02, 0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00,
-    0x64, 0x00, 0x6E, 0x02, 0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00,
-    0x64, 0x00, 0x93, 0x02, 0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00,
-    0x64, 0x00, 0xBA, 0x02, 0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00,
-    0x64, 0x00, 0xE4, 0x02, 0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00,
-    0x64, 0x00, 0x3F, 0x03, 0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00,
-    0x64, 0x00, 0x70, 0x03, 0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00,
-    0x64, 0x00, 0xA4, 0x03, 0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00,
-    0x64, 0x00, 0xDC, 0x03, 0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00,
-    0x64, 0x00, 0x17, 0x04, 0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00,
-    // Silence
-    // ToneDur,    Freq1,      Vol1,       Freq2       Vol2
-    0x70, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xFD, 0xFF, // -3 ENDOFLOOP INDICATOR
-    // Another silence
-    // ToneDur,    Freq1,      Vol1,       Freq2       Vol2
-    0x70, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xFF, 0xFF // -1 SEQ_CMD_RET INDICATOR
-    };
+#ifdef MM_TB101_L
+		// Valid data for tone sequence. This code should be used for non-ref tests. This is a valid tone sequence for HW
+		const TUint8 KFixedSequenceTestSequenceDataX[]=
+		{
+		0x02, 0x4A, 0x3A, 0x69, 0x39, 0xBD, 0xAD, 0xA5,
+		0x84, 0x81, 0xD1, 0xD5, 0xB9, 0x94, 0x04, 0x00,
+		0x27, 0x34, 0x41, 0x0B, 0x2A, 0x82, 0x68, 0x51,
+		0x72, 0x19, 0x22, 0xC9, 0x21, 0x47, 0x10, 0x4C,
+		0x85, 0x48, 0x71, 0x06, 0x90, 0x48, 0x85, 0x48,
+		0x68, 0x20, 0x00
+		};
+#else
+	// Valid data for tone sequence for reference platform. Below tone data may not work for HW devices
+	const TUint8 KFixedSequenceTestSequenceDataX[]=
+		{
+		0x53, 0x51, 0x4E, 0x43, // HEADER
+		0xFE, 0xFF, // -2 STARTLOOP INDICATOR
+		0x0A, 0x00,  // Number of times that the sequence will be played
+		/* Tone Data constitutes the following:
+		  ToneDur,    Freq1,      Vol1,       Freq2       Vol2
+		The sequence is arranged in blocks of 8 bits to represent 16 bit values,
+		which allows more dynamic range, frequency and time values.
+		The tag Low and High mean low and high byte block.
+		Low    Hi    Low   Hi   Low   Hi    Low   Hi    Low   Hi
+		*/
+		0x64, 0x00, 0xB8, 0x01, 0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00,
+		0x64, 0x00, 0xD2, 0x01, 0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00,
+		0x64, 0x00, 0xEE, 0x01, 0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00,
+		0x64, 0x00, 0x0B, 0x02, 0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00,
+		0x64, 0x00, 0x2A, 0x02, 0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00,
+		0x64, 0x00, 0x4B, 0x02, 0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00,
+		0x64, 0x00, 0x6E, 0x02, 0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00,
+		0x64, 0x00, 0x93, 0x02, 0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00,
+		0x64, 0x00, 0xBA, 0x02, 0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00,
+		0x64, 0x00, 0xE4, 0x02, 0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00,
+		0x64, 0x00, 0x3F, 0x03, 0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00,
+		0x64, 0x00, 0x70, 0x03, 0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00,
+		0x64, 0x00, 0xA4, 0x03, 0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00,
+		0x64, 0x00, 0xDC, 0x03, 0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00,
+		0x64, 0x00, 0x17, 0x04, 0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00,
+		// Silence
+		// ToneDur,    Freq1,      Vol1,       Freq2       Vol2
+		0x70, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0xFD, 0xFF, // -3 ENDOFLOOP INDICATOR
+		// Another silence
+		// ToneDur,    Freq1,      Vol1,       Freq2       Vol2
+		0x70, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0xFF, 0xFF // -1 SEQ_CMD_RET INDICATOR
+		};
+
+
+#endif//#if defined(MM_TB101_L)
+
 
 #endif	// CHAR_A3F_DEVSOUND_COMPLIANCESUITECONSTANTS_H
 

--- a/devsound/a3fcharacterisationtest/src/char_a3f_devsound_recordtest.cpp	Fri Jul 09 13:09:11 2010 +0100
+++ b/devsound/a3fcharacterisationtest/src/char_a3f_devsound_recordtest.cpp	Mon Aug 23 18:56:36 2010 +0100
@@ -23,8 +23,8 @@
  * MM-A3F-DEVSOUND-CHRTZ-REC-RAW-0001
  */
 RA3FDevSoundRecordConfigurationSetConfigTest::RA3FDevSoundRecordConfigurationSetConfigTest(const TDesC& aTestName)
-	: 	RA3FDevSoundTestBase(aTestName),  
-	iSampleRate(0), 
+	: 	RA3FDevSoundTestBase(aTestName),
+	iSampleRate(0),
 	iChannels(0)
 	{
 	}
@@ -37,13 +37,13 @@
 
 void RA3FDevSoundRecordConfigurationSetConfigTest::DoKickoffTestL()
 	{
-	if ( !GetIntFromConfig(iTestStepName, KSampleRate, iSampleRate) ) 
+	if ( !GetIntFromConfig(iTestStepName, KSampleRate, iSampleRate) )
 		{
 		ERR_PRINTF2(KMsgErrorGetParameter, &KSampleRate);
 		StopTest(KErrNotFound, ETestSuiteError);
 		return;
 		}
-	if ( !GetIntFromConfig(iTestStepName, KChannel, iChannels) ) 
+	if ( !GetIntFromConfig(iTestStepName, KChannel, iChannels) )
 		{
 		ERR_PRINTF2(KMsgErrorGetParameter, &KChannel);
 		StopTest(KErrNotFound, ETestSuiteError);
@@ -109,12 +109,12 @@
 					StopTest(err);
 					break;
 					}
-				
+
 				INFO_PRINTF1(_L("Getting DevSound capabilities for verifying."));
 				TMMFCapabilities getCapabilities = iMMFDevSound->Config();
 				if ((capabilities.iRate != getCapabilities.iRate)||(capabilities.iChannels != getCapabilities.iChannels))
 					{
-					ERR_PRINTF3(_L("Configuration of DevSound object does not match with set capabilities! Rate = %u Channels = %u "), 
+					ERR_PRINTF3(_L("Configuration of DevSound object does not match with set capabilities! Rate = %u Channels = %u "),
 							getCapabilities.iRate, getCapabilities.iChannels);
 					StopTest(err, EFail);
 					}
@@ -123,7 +123,7 @@
 					INFO_PRINTF3(_L("DevSound configuration is a match rate = %u channels = %u"), getCapabilities.iRate, getCapabilities.iChannels);
 					StopTest();
 					}
-				
+
 				}
 			else if (aDevSoundEvent == EEventInitComplete && aError != KErrNone)
 				{
@@ -150,7 +150,7 @@
  * MM-A3F-DEVSOUND-CHRTZ-REC-RAW-0002
  */
 RA3FDevSoundRecordConfigurationSetPriorityTest::RA3FDevSoundRecordConfigurationSetPriorityTest(const TDesC& aTestName)
-	: 	RA3FDevSoundTestBase(aTestName), 
+	: 	RA3FDevSoundTestBase(aTestName),
 		iPriority(EMdaPriorityNormal)
 	{
 	}
@@ -163,7 +163,7 @@
 
 void RA3FDevSoundRecordConfigurationSetPriorityTest::DoKickoffTestL()
 	{
-	if ( !GetIntFromConfig(iTestStepName, KPriority, iPriority) ) 
+	if ( !GetIntFromConfig(iTestStepName, KPriority, iPriority) )
 		{
 		ERR_PRINTF2(KMsgErrorGetParameter, &KPriority);
 		StopTest(KErrNotFound, ETestSuiteError);
@@ -242,7 +242,7 @@
  * MM-A3F-DEVSOUND-CHRTZ-REC-RAW-0003
  */
 RA3FDevSoundRecordConfigurationSetGainTest::RA3FDevSoundRecordConfigurationSetGainTest(const TDesC& aTestName)
-	: 	RA3FDevSoundTestBase(aTestName), 
+	: 	RA3FDevSoundTestBase(aTestName),
 		iGain(0)
 	{
 	}
@@ -261,7 +261,7 @@
 		StopTest(KErrNotFound, ETestSuiteError);
 		return;
 		}
-	
+
 	TPtrC fourccCode;
 	if ( !GetStringFromConfig(iTestStepName, KFourccCode, fourccCode) )
 		{
@@ -303,17 +303,17 @@
 			{
 			if (aDevSoundEvent == EEventInitComplete && aError == KErrNone)
 				{
-				INFO_PRINTF2( _L("Setting the input gain to %d using iMMFDevSound->SetGain"),iGain);	
+				INFO_PRINTF2( _L("Setting the input gain to %d using iMMFDevSound->SetGain"),iGain);
 				iMMFDevSound->SetGain(iGain);
-				
+
 				INFO_PRINTF1(_L("Call Gain() for verifying."));
 				TInt getGain = iMMFDevSound->Gain();
-				
+
 				if (iGain != getGain)
 					{
-					ERR_PRINTF2(_L("Configuration of DevSound object does not match with set gain! Gain = %d"), 
+					ERR_PRINTF2(_L("Configuration of DevSound object does not match with set gain! Gain = %d"),
 							getGain);
-					ERR_PRINTF2(_L("Expected Gain = %d"), 
+					ERR_PRINTF2(_L("Expected Gain = %d"),
 							iGain);
 					StopTest(aError, EFail);
 					}
@@ -322,7 +322,7 @@
 					INFO_PRINTF2(_L("Gain has the expected value = %d"), getGain);
 					StopTest();
 					}
-				
+
 				}
 			else if (aDevSoundEvent == EEventInitComplete && aError != KErrNone)
 				{
@@ -349,7 +349,7 @@
  * MM-A3F-DEVSOUND-CHRTZ-REC-RAW-0004
  */
 RA3FDevSoundRecordConfigurationSetRecordBalanceTest::RA3FDevSoundRecordConfigurationSetRecordBalanceTest(const TDesC& aTestName)
-	: 	RA3FDevSoundTestBase(aTestName), 
+	: 	RA3FDevSoundTestBase(aTestName),
 		iLRecordBalance(0), iRRecordBalance(0)
 	{
 	}
@@ -415,8 +415,8 @@
 		case EStateInitializing:
 			{
 			if (aDevSoundEvent == EEventInitComplete && aError == KErrNone)
-				{	
-				INFO_PRINTF3(_L("Calling iMMFDevSound->SetRecordBalanceL using the corresponding values %d and %d"),iLRecordBalance,iRRecordBalance);			
+				{
+				INFO_PRINTF3(_L("Calling iMMFDevSound->SetRecordBalanceL using the corresponding values %d and %d"),iLRecordBalance,iRRecordBalance);
 				TRAPD(err,iMMFDevSound->SetRecordBalanceL(iLRecordBalance, iRRecordBalance));
 				if (err != KErrNone)
 					{
@@ -424,7 +424,7 @@
 					StopTest(err);
 					break;
 					}
-				
+
 				INFO_PRINTF1(_L("Call GetRecordBalanceL for verifying."));
 				TInt getLRecordBalance;
 				TInt getRRecordBalance;
@@ -437,13 +437,13 @@
 					}
 				if ((iLRecordBalance != getLRecordBalance)||(iRRecordBalance != getRRecordBalance))
 					{
-					ERR_PRINTF3(_L("Configuration of DevSound object does not match with set balance! LRecordBalance = %d RRecordBalance = %d"), 
+					ERR_PRINTF3(_L("Configuration of DevSound object does not match with set balance! LRecordBalance = %d RRecordBalance = %d"),
 							getLRecordBalance, getRRecordBalance);
 					StopTest(aError, EFail);
 					}
 				else
 					{
-					INFO_PRINTF3(_L("Balance configuration matches left balance = %d right balance = %d"), 
+					INFO_PRINTF3(_L("Balance configuration matches left balance = %d right balance = %d"),
 							getLRecordBalance, getRRecordBalance);
 					StopTest();
 					}
@@ -473,7 +473,7 @@
  * MM-A3F-DEVSOUND-CHRTZ-REC-RAW-0005
  */
 RA3FDevSoundRecordSetGainWhileRecordingTest::RA3FDevSoundRecordSetGainWhileRecordingTest(const TDesC& aTestName)
-	: 	RA3FDevSoundTestBase(aTestName), iDuration(0), 
+	: 	RA3FDevSoundTestBase(aTestName), iDuration(0),
 		iCalledSetGain(EFalse)
 	{
 	}
@@ -486,7 +486,7 @@
 
 void RA3FDevSoundRecordSetGainWhileRecordingTest::DoKickoffTestL()
 	{
-	if ( !GetIntFromConfig(iTestStepName, KDuration, iDuration) ) 
+	if ( !GetIntFromConfig(iTestStepName, KDuration, iDuration) )
 		{
 		ERR_PRINTF2(KMsgErrorGetParameter, &KDuration);
 		StopTest(KErrNotFound, ETestSuiteError);
@@ -499,7 +499,7 @@
 		StopTest(KErrNotFound, ETestSuiteError);
 		return;
 		}
-	// Open file for recording using RFile 
+	// Open file for recording using RFile
 	TFileName fileNameType;
 	fileNameType.Copy(filename);
 	INFO_PRINTF2(_L("Opening file for recording %S"), &fileNameType);
@@ -555,12 +555,12 @@
 			if (aDevSoundEvent == EEventInitComplete && aError == KErrNone)
 				{
 				INFO_PRINTF1(_L("DevSound Initialized to record audio."));
-				
+
 				INFO_PRINTF2(_L("Calling SetGain to initial value of %d"), iMMFDevSound->MaxGain()/2);
 				iMMFDevSound->SetGain(iMMFDevSound->MaxGain()/2);
-				
+
 				INFO_PRINTF1(_L("Calling iMMFDevSound->RecordInitL()"));
-				TRAPD(err, iMMFDevSound->RecordInitL()); 
+				TRAPD(err, iMMFDevSound->RecordInitL());
 				if (err != KErrNone)
 					{
 					ERR_PRINTF2(_L("DevSound RecordInitL left with error = %d"), err);
@@ -570,7 +570,7 @@
 				else
 					{
 					INFO_PRINTF2(_L("Starting timer %d uS"), (iDuration * KMicroSecsInOneSec));
-					StartTimer((iDuration * KMicroSecsInOneSec));		
+					StartTimer((iDuration * KMicroSecsInOneSec));
 					}
 				INFO_PRINTF1(_L("DevSound State: EStateRecording"));
 				iDevSoundState = EStateRecording;
@@ -593,7 +593,7 @@
 				{
 				// Write buffer to file
 				INFO_PRINTF1(_L("Writing data to file"));
-				CMMFDataBuffer* buffer = static_cast <CMMFDataBuffer*> (iBuffer);			
+				CMMFDataBuffer* buffer = static_cast <CMMFDataBuffer*> (iBuffer);
 				iAsyncWriteBTFAO->Start(buffer);
 				}
 			else if(aDevSoundEvent == EEventTimerComplete)
@@ -614,7 +614,7 @@
 				{
 				if (aDevSoundEvent == EEventBTBE)
 					{
-					CMMFDataBuffer* buffer = static_cast <CMMFDataBuffer*> (iBuffer);			
+					CMMFDataBuffer* buffer = static_cast <CMMFDataBuffer*> (iBuffer);
 					iAsyncWriteBTFAO->Start(buffer);
 					}
 				else
@@ -639,7 +639,7 @@
 		{
 		INFO_PRINTF2(_L("Calling SetGain to value of %d"), iMMFDevSound->MaxGain());
 		iMMFDevSound->SetGain(iMMFDevSound->MaxGain());
-		
+
 		INFO_PRINTF2(_L("Calling Gain to verify gain value"), iMMFDevSound->MaxGain());
 		TInt gain = iMMFDevSound->Gain();
 		if(gain != iMMFDevSound->MaxGain())
@@ -724,14 +724,14 @@
 			break;
 			}
 		case EStateInitializing:
-			{			
+			{
 			if (aDevSoundEvent == EEventInitComplete && aError == KErrNone)
 				{
 				TInt maxGain = iMMFDevSound->MaxGain();
-				INFO_PRINTF2(_L("MaxGain returns a value of %d"),maxGain);			
-				INFO_PRINTF2(_L("Call iMMFDevSound->SetGain using the gain value %d"),iGain + maxGain);			
+				INFO_PRINTF2(_L("MaxGain returns a value of %d"),maxGain);
+				INFO_PRINTF2(_L("Call iMMFDevSound->SetGain using the gain value %d"),iGain + maxGain);
 				iMMFDevSound->SetGain(iGain+iMMFDevSound->MaxGain());
-				
+
 				INFO_PRINTF1(_L("Call Gain() for verifying."));
 				if(iMMFDevSound->Gain() == iMMFDevSound->MaxGain())
 					{
@@ -831,10 +831,10 @@
 			break;
 			}
 		case EStateInitializing:
-			{			
+			{
 			if (aDevSoundEvent == EEventInitComplete && aError == KErrNone)
-				{			
-				INFO_PRINTF2(_L("Call iMMFDevSound->SetGain using the negative gain value %d"),iGain);			
+				{
+				INFO_PRINTF2(_L("Call iMMFDevSound->SetGain using the negative gain value %d"),iGain);
 				iMMFDevSound->SetGain(iGain);
 				INFO_PRINTF1(_L("Call Gain() for verifying."));
 				TInt gainGet = iMMFDevSound->Gain();
@@ -900,7 +900,7 @@
 		StopTest(KErrNotFound, ETestSuiteError);
 		return;
 		}
-	
+
 	TPtrC fourccCode;
 	if ( !GetStringFromConfig(iTestStepName, KFourccCode, fourccCode) )
 		{
@@ -939,10 +939,10 @@
 			break;
 			}
 		case EStateInitializing:
-			{			
+			{
 			if (aDevSoundEvent == EEventInitComplete && aError == KErrNone)
 				{
-				INFO_PRINTF3(_L("Calling SetRecordBalanceL using values beyond upper boundaries: left = %d right = %d"), iLRecordBalance, iRRecordBalance);			
+				INFO_PRINTF3(_L("Calling SetRecordBalanceL using values beyond upper boundaries: left = %d right = %d"), iLRecordBalance, iRRecordBalance);
 				TRAPD(err,iMMFDevSound->SetRecordBalanceL(iLRecordBalance, iRRecordBalance));
 				if (err != KErrNone)
 					{
@@ -950,7 +950,7 @@
 					StopTest(err);
 					break;
 					}
-				
+
 				INFO_PRINTF1(_L("Call GetRecordBalanceL() for verifying."));
 				TRAP(err,iMMFDevSound->GetRecordBalanceL(iLRecordBalance, iRRecordBalance));
 				if (err != KErrNone)
@@ -1074,7 +1074,7 @@
 			{
 			if (aDevSoundEvent == EEventInitComplete && aError == KErrNone)
 				{
-				INFO_PRINTF3(_L("Calling CMMFDevSound::SetRecordBalanceL using negative values %d and %d"),iLRecordBalance, iRRecordBalance);			
+				INFO_PRINTF3(_L("Calling CMMFDevSound::SetRecordBalanceL using negative values %d and %d"),iLRecordBalance, iRRecordBalance);
 				TRAPD(err,iMMFDevSound->SetRecordBalanceL(iLRecordBalance, iRRecordBalance));
 				if (err != KErrNone)
 					{
@@ -1131,7 +1131,7 @@
  * MM-A3F-DEVSOUND-CHRTZ-REC-RAW-0010
  */
 RA3FDevSoundRecordConfigurationSetGainWhenInitToPlayAudioTest::RA3FDevSoundRecordConfigurationSetGainWhenInitToPlayAudioTest(const TDesC& aTestName)
-	: 	RA3FDevSoundTestBase(aTestName), 
+	: 	RA3FDevSoundTestBase(aTestName),
 		iGain(0), iInitializedToRecord(EFalse)
 	{
 	}
@@ -1150,7 +1150,7 @@
 		StopTest(KErrNotFound, ETestSuiteError);
 		return;
 		}
-	
+
 	TPtrC fourccCode;
 	if ( !GetStringFromConfig(iTestStepName, KFourccCode, fourccCode) )
 		{
@@ -1195,9 +1195,9 @@
 				if (iInitializedToRecord == EFalse)
 					{
 					INFO_PRINTF1(_L("DevSound Initialized to play audio."));
-					INFO_PRINTF2( _L("Setting the input gain to %d using iMMFDevSound->SetGain"),iGain);	
+					INFO_PRINTF2( _L("Setting the input gain to %d using iMMFDevSound->SetGain"),iGain);
 					iMMFDevSound->SetGain(iGain);
-					
+
 					INFO_PRINTF1(_L("Calling CMMFDevSound::InitializeL to Record Audio"));
 					TRAPD(err, iMMFDevSound->InitializeL(*this,iFourCCCode,EMMFStateRecording));
 					if (err != KErrNone)
@@ -1213,17 +1213,17 @@
 					INFO_PRINTF1(_L("DevSound Initialized to record audio."));
 					INFO_PRINTF1(_L("Call Gain() for verifying."));
 					TInt getGain = iMMFDevSound->Gain();
-					
+
 					if (iGain != getGain)
 						{
-						ERR_PRINTF2(_L("Configuration of DevSound object does not match with set gain! Gain = %d"), 
+						ERR_PRINTF2(_L("Configuration of DevSound object does not match with set gain! Gain = %d"),
 								getGain);
 						ERR_PRINTF2(_L("Expected Gain = %d"), iGain);
 						StopTest(aError, EFail);
 						}
 					else
 						{
-						INFO_PRINTF2(_L("Gain value is as expected = %d"), 
+						INFO_PRINTF2(_L("Gain value is as expected = %d"),
 								getGain);
 						StopTest();
 						}
@@ -1254,7 +1254,7 @@
  * MM-A3F-DEVSOUND-CHRTZ-REC-RAW-0011
  */
 RA3FDevSoundRecordConfigurationSetGainWhenInitToPlayTonesTest::RA3FDevSoundRecordConfigurationSetGainWhenInitToPlayTonesTest(const TDesC& aTestName)
-	: 	RA3FDevSoundTestBase(aTestName), 
+	: 	RA3FDevSoundTestBase(aTestName),
 		iGain(0), iInitializedToRecord(EFalse)
 	{
 	}
@@ -1273,7 +1273,7 @@
 		StopTest(KErrNotFound, ETestSuiteError);
 		return;
 		}
-	
+
 	TPtrC fourccCode;
 	if ( !GetStringFromConfig(iTestStepName, KFourccCode, fourccCode) )
 		{
@@ -1318,9 +1318,9 @@
 				if (iInitializedToRecord == EFalse)
 					{
 					INFO_PRINTF1(_L("DevSound Initialized to play tones."));
-					INFO_PRINTF2( _L("Setting the input gain to %d using iMMFDevSound->SetGain"),iGain);	
+					INFO_PRINTF2( _L("Setting the input gain to %d using iMMFDevSound->SetGain"),iGain);
 					iMMFDevSound->SetGain(iGain);
-					
+
 					INFO_PRINTF1(_L("Calling CMMFDevSound::InitializeL to Record Audio"));
 					TRAPD(err, iMMFDevSound->InitializeL(*this,iFourCCCode,EMMFStateRecording));
 					if (err != KErrNone)
@@ -1336,17 +1336,17 @@
 					INFO_PRINTF1(_L("DevSound Initialized to record audio."));
 					INFO_PRINTF1(_L("Call Gain() for verifying."));
 					TInt getGain = iMMFDevSound->Gain();
-					
+
 					if (iGain != getGain)
 						{
-						ERR_PRINTF2(_L("Configuration of DevSound object does not match with set gain! Gain = %d"), 
+						ERR_PRINTF2(_L("Configuration of DevSound object does not match with set gain! Gain = %d"),
 								getGain);
 						ERR_PRINTF2(_L("Expected Gain = %d"), iGain);
 						StopTest(aError, EFail);
 						}
 					else
 						{
-						INFO_PRINTF2(_L("Gain value is as expected = %d"), 
+						INFO_PRINTF2(_L("Gain value is as expected = %d"),
 								getGain);
 						StopTest();
 						}
@@ -1377,9 +1377,9 @@
  * MM-A3F-DEVSOUND-CHRTZ-REC-RAW-0012
  */
 RA3FDevSoundRecordConfigurationSetRecordBalanceWhenInitToPlayAudioTest::RA3FDevSoundRecordConfigurationSetRecordBalanceWhenInitToPlayAudioTest(const TDesC& aTestName)
-	: 	RA3FDevSoundTestBase(aTestName), 
-		iLRecordBalance(0), 
-		iRRecordBalance(0), 
+	: 	RA3FDevSoundTestBase(aTestName),
+		iLRecordBalance(0),
+		iRRecordBalance(0),
 		iInitializedToRecord(EFalse)
 	{
 	}
@@ -1404,7 +1404,7 @@
 		StopTest(KErrNotFound, ETestSuiteError);
 		return;
 		}
-	
+
 	TPtrC fourccCode;
 	if ( !GetStringFromConfig(iTestStepName, KFourccCode, fourccCode) )
 		{
@@ -1449,8 +1449,8 @@
 				if (iInitializedToRecord == EFalse)
 					{
 					INFO_PRINTF1(_L("DevSound Initialized to play audio."));
-					
-					INFO_PRINTF3(_L("Calling iMMFDevSound->SetRecordBalanceL using the corresponding values %d and %d"),iLRecordBalance,iRRecordBalance);			
+
+					INFO_PRINTF3(_L("Calling iMMFDevSound->SetRecordBalanceL using the corresponding values %d and %d"),iLRecordBalance,iRRecordBalance);
 					TRAPD(err,iMMFDevSound->SetRecordBalanceL(iLRecordBalance, iRRecordBalance));
 					if (err != KErrNone)
 						{
@@ -1458,7 +1458,7 @@
 						StopTest(err);
 						break;
 						}
-					
+
 					INFO_PRINTF1(_L("Calling CMMFDevSound::InitializeL to Record Audio"));
 					TRAP(err, iMMFDevSound->InitializeL(*this,iFourCCCode,EMMFStateRecording));
 					if (err != KErrNone)
@@ -1472,7 +1472,7 @@
 				else
 					{
 					INFO_PRINTF1(_L("DevSound Initialized to record audio."));
-					
+
 					INFO_PRINTF1(_L("Call GetRecordBalanceL for verifying."));
 					TInt getLRecordBalance;
 					TInt getRRecordBalance;
@@ -1485,17 +1485,17 @@
 						}
 					if ((iLRecordBalance != getLRecordBalance)||(iRRecordBalance != getRRecordBalance))
 						{
-						ERR_PRINTF3(_L("Configuration of DevSound object does not match with set balance! LRecordBalance = %d RRecordBalance = %d"), 
+						ERR_PRINTF3(_L("Configuration of DevSound object does not match with set balance! LRecordBalance = %d RRecordBalance = %d"),
 								getLRecordBalance, getRRecordBalance);
 						StopTest(aError, EFail);
 						}
 					else
 						{
-						INFO_PRINTF3(_L("Balance values are as expected, Left = %d Right = %d"), 
+						INFO_PRINTF3(_L("Balance values are as expected, Left = %d Right = %d"),
 								getLRecordBalance, getRRecordBalance);
 						StopTest();
 						}
-					
+
 					}
 				}
 			else if (aDevSoundEvent == EEventInitComplete && aError != KErrNone)
@@ -1523,9 +1523,9 @@
  * MM-A3F-DEVSOUND-CHRTZ-REC-RAW-0013
  */
 RA3FDevSoundRecordConfigurationSetRecordBalanceWhenInitToPlayTonesTest::RA3FDevSoundRecordConfigurationSetRecordBalanceWhenInitToPlayTonesTest(const TDesC& aTestName)
-	: 	RA3FDevSoundTestBase(aTestName), 
-		iLRecordBalance(0), 
-		iRRecordBalance(0), 
+	: 	RA3FDevSoundTestBase(aTestName),
+		iLRecordBalance(0),
+		iRRecordBalance(0),
 		iInitializedToRecord(EFalse)
 	{
 	}
@@ -1550,7 +1550,7 @@
 		StopTest(KErrNotFound, ETestSuiteError);
 		return;
 		}
-	
+
 	TPtrC fourccCode;
 	if ( !GetStringFromConfig(iTestStepName, KFourccCode, fourccCode) )
 		{
@@ -1595,8 +1595,8 @@
 				if (iInitializedToRecord == EFalse)
 					{
 					INFO_PRINTF1(_L("DevSound Initialized to play tones."));
-					
-					INFO_PRINTF3(_L("Calling iMMFDevSound->SetRecordBalanceL using the corresponding values %d and %d"),iLRecordBalance,iRRecordBalance);			
+
+					INFO_PRINTF3(_L("Calling iMMFDevSound->SetRecordBalanceL using the corresponding values %d and %d"),iLRecordBalance,iRRecordBalance);
 					TRAPD(err,iMMFDevSound->SetRecordBalanceL(iLRecordBalance, iRRecordBalance));
 					if (err != KErrNone)
 						{
@@ -1604,7 +1604,7 @@
 						StopTest(err);
 						break;
 						}
-					
+
 					INFO_PRINTF1(_L("Calling CMMFDevSound::InitializeL to Record Audio"));
 					TRAP(err, iMMFDevSound->InitializeL(*this,iFourCCCode,EMMFStateRecording));
 					if (err != KErrNone)
@@ -1618,7 +1618,7 @@
 				else
 					{
 					INFO_PRINTF1(_L("DevSound Initialized to record audio."));
-					
+
 					INFO_PRINTF1(_L("Call GetRecordBalanceL for verifying."));
 					TInt getLRecordBalance;
 					TInt getRRecordBalance;
@@ -1631,17 +1631,17 @@
 						}
 					if ((iLRecordBalance != getLRecordBalance)||(iRRecordBalance != getRRecordBalance))
 						{
-						ERR_PRINTF3(_L("Configuration of DevSound object does not match with set balance! LRecordBalance = %d RRecordBalance = %d"), 
+						ERR_PRINTF3(_L("Configuration of DevSound object does not match with set balance! LRecordBalance = %d RRecordBalance = %d"),
 								getLRecordBalance, getRRecordBalance);
 						StopTest(aError, EFail);
 						}
 					else
 						{
-						INFO_PRINTF3(_L("Balance values are as expected, Left = %d Right = %d"), 
+						INFO_PRINTF3(_L("Balance values are as expected, Left = %d Right = %d"),
 								getLRecordBalance, getRRecordBalance);
 						StopTest();
 						}
-					
+
 					}
 				}
 			else if (aDevSoundEvent == EEventInitComplete && aError != KErrNone)
@@ -1669,9 +1669,9 @@
  * MM-A3F-DEVSOUND-CHRTZ-REC-RAW-0014
  */
 RA3FDevSoundCallSetConfigLWhileRecordingConfigurationTest::RA3FDevSoundCallSetConfigLWhileRecordingConfigurationTest(const TDesC& aTestName)
-	:	RA3FDevSoundTestBase(aTestName), 
+	:	RA3FDevSoundTestBase(aTestName),
 		iDuration(0),
-		iSampleRate(0), 
+		iSampleRate(0),
 		iChannels(0),
 		iCallConfig(EFalse)
 	{
@@ -1685,19 +1685,19 @@
 
 void RA3FDevSoundCallSetConfigLWhileRecordingConfigurationTest::DoKickoffTestL()
 	{
-	if ( !GetIntFromConfig(iTestStepName, KSampleRate, iSampleRate) ) 
+	if ( !GetIntFromConfig(iTestStepName, KSampleRate, iSampleRate) )
 		{
 		ERR_PRINTF2(KMsgErrorGetParameter, &KSampleRate);
 		StopTest(KErrNotFound, ETestSuiteError);
 		return;
 		}
-	if ( !GetIntFromConfig(iTestStepName, KChannel, iChannels) ) 
+	if ( !GetIntFromConfig(iTestStepName, KChannel, iChannels) )
 		{
 		ERR_PRINTF2(KMsgErrorGetParameter, &KChannel);
 		StopTest(KErrNotFound, ETestSuiteError);
 		return;
 		}
-	if ( !GetIntFromConfig(iTestStepName, KDuration, iDuration) ) 
+	if ( !GetIntFromConfig(iTestStepName, KDuration, iDuration) )
 		{
 		ERR_PRINTF2(KMsgErrorGetParameter, &KDuration);
 		StopTest(KErrNotFound, ETestSuiteError);
@@ -1710,7 +1710,7 @@
 		StopTest(KErrNotFound, ETestSuiteError);
 		return;
 		}
-	// Open file for recording using RFile 
+	// Open file for recording using RFile
 	TFileName fileNameType;
 	fileNameType.Copy(filename);
 	INFO_PRINTF2(_L("Opening file for recording %S"), &fileNameType);
@@ -1766,9 +1766,9 @@
 			if (aDevSoundEvent == EEventInitComplete && aError == KErrNone)
 				{
 				INFO_PRINTF1(_L("DevSound Initialized to record audio."));
-				
+
 				INFO_PRINTF1(_L("Calling iMMFDevSound->RecordInitL()"));
-				TRAPD(err, iMMFDevSound->RecordInitL()); 
+				TRAPD(err, iMMFDevSound->RecordInitL());
 				if (err != KErrNone)
 					{
 					ERR_PRINTF2(_L("DevSound RecordInitL left with error = %d"), err);
@@ -1778,7 +1778,7 @@
 				else
 					{
 					INFO_PRINTF2(_L("Starting timer %d uS"), (iDuration * KMicroSecsInOneSec));
-					StartTimer((iDuration * KMicroSecsInOneSec));		
+					StartTimer((iDuration * KMicroSecsInOneSec));
 					}
 				INFO_PRINTF1(_L("DevSound State: EStateRecording"));
 				iDevSoundState = EStateRecording;
@@ -1860,7 +1860,7 @@
 		iCallConfig = ETrue;
 		}
 	}
-	
+
 /*
  *========================================================================================================
  * MM-A3F-DEVSOUND-CHRTZ-REC-RAW-0015
@@ -1918,13 +1918,13 @@
 		case EStateInitializing:
 			{
 			if (aDevSoundEvent == EEventInitComplete && aError == KErrNone)
-				{	
+				{
 				INFO_PRINTF1(_L("DevSound Initialized to record audio."));
-				
+
 				INFO_PRINTF1(_L("Calling query method Capabilities()"));
 				TMMFCapabilities capabilities = iMMFDevSound->Capabilities();
 				PrintSupportedCapabilities(capabilities.iRate, capabilities.iChannels);
-			
+
 				StopTest();
 				}
 			else if (aDevSoundEvent == EEventInitComplete && aError != KErrNone)
@@ -2143,11 +2143,11 @@
 		case EStateInitializing:
 			{
 			if (aDevSoundEvent == EEventInitComplete && aError == KErrNone)
-				{	
+				{
 				INFO_PRINTF1(_L("DevSound Initialized to record audio."));
 				TInt getLRecordBalance = 0;
 				TInt getRRecordBalance = 0;
-				
+
 				INFO_PRINTF1(_L("Calling query method GetRecordBalanceL()"));
 				TRAPD(err,iMMFDevSound->GetRecordBalanceL(getLRecordBalance, getRRecordBalance));
 				if (err != KErrNone)
@@ -2247,11 +2247,11 @@
 		case EStateInitializing:
 			{
 			if (aDevSoundEvent == EEventInitComplete && aError == KErrNone)
-				{	
+				{
 				INFO_PRINTF1(_L("DevSound Initialized to record audio."));
-				
+
 				INFO_PRINTF1(_L("Calling query method GetSupportedOutputDataTypesL()"));
-				
+
 				TMMFPrioritySettings prioritySettings;
 				TRAPD(err,iMMFDevSound->GetSupportedOutputDataTypesL(iSupportedFourCCs,prioritySettings));
 				if (err != KErrNone)
@@ -2382,9 +2382,9 @@
 		case EStateInitializing:
 			{
 			if (aDevSoundEvent == EEventInitComplete && aError == KErrNone)
-				{	
+				{
 				INFO_PRINTF1(_L("DevSound Initialized to record audio."));
-				
+
 				INFO_PRINTF1(_L("Calling query method MaxGain()"));
 				TInt maxGain = iMMFDevSound->MaxGain();
 				INFO_PRINTF2(_L("Record Max Gain  %d"), maxGain);
@@ -2483,13 +2483,13 @@
 		case EStateInitializing:
 			{
 			if (aDevSoundEvent == EEventInitComplete && aError == KErrNone)
-				{	
+				{
 				INFO_PRINTF1(_L("DevSound Initialized to record audio."));
-				
+
 				INFO_PRINTF1(_L("Calling query method SamplesRecorded()"));
 				TInt samplesRecorded = iMMFDevSound->SamplesRecorded();
 				INFO_PRINTF2(_L("Samples Recorded  %d"), samplesRecorded);
-				
+
 				if(samplesRecorded == iExSamplesRecorded)
 					{
 					INFO_PRINTF1(_L("Samples Recorded match the expected value"));
@@ -2578,12 +2578,12 @@
 		case EStateInitializing:
 			{
 			if (aDevSoundEvent == EEventInitComplete && aError == KErrNone)
-				{	
+				{
 				INFO_PRINTF1(_L("DevSound Initialized to record audio."));
-				
+
 				INFO_PRINTF1(_L("Calling query method Gain()"));
 				INFO_PRINTF2(_L("Current Gain = %d"),iMMFDevSound->Gain());
-				if(iMMFDevSound->Gain() == iMMFDevSound->MaxGain()/2)
+				if(iMMFDevSound->Gain() == (iMMFDevSound->MaxGain()+1)/2)
 					{
 					INFO_PRINTF2(_L("Gain equals the expected default value of MaxGain/2 = %d"),iMMFDevSound->MaxGain()/2);
 					StopTest();
@@ -2619,8 +2619,8 @@
  * MM-A3F-DEVSOUND-CHRTZ-REC-RAW-0022
  */
 RA3FDevSoundQueryRecordCapabilitiesWhileRecordingTest::RA3FDevSoundQueryRecordCapabilitiesWhileRecordingTest(const TDesC& aTestName)
-	:	RA3FDevSoundTestBase(aTestName), 
-		iDuration(0), 
+	:	RA3FDevSoundTestBase(aTestName),
+		iDuration(0),
 		iQueryRecordingSettings(EFalse),
 		iExCapChannels(0),
 		iExCapRate(0)
@@ -2635,19 +2635,19 @@
 
 void RA3FDevSoundQueryRecordCapabilitiesWhileRecordingTest::DoKickoffTestL()
 	{
-	if ( !GetIntFromConfig(iTestStepName, KExCapChannels, iExCapChannels) ) 
+	if ( !GetIntFromConfig(iTestStepName, KExCapChannels, iExCapChannels) )
 		{
 		ERR_PRINTF2(KMsgErrorGetParameter, &KExCapChannels);
 		StopTest(KErrNotFound, ETestSuiteError);
 		return;
 		}
-	if ( !GetIntFromConfig(iTestStepName, KExCapRate, iExCapRate) ) 
+	if ( !GetIntFromConfig(iTestStepName, KExCapRate, iExCapRate) )
 		{
 		ERR_PRINTF2(KMsgErrorGetParameter, &KExCapRate);
 		StopTest(KErrNotFound, ETestSuiteError);
 		return;
 		}
-	if ( !GetIntFromConfig(iTestStepName, KDuration, iDuration) ) 
+	if ( !GetIntFromConfig(iTestStepName, KDuration, iDuration) )
 		{
 		ERR_PRINTF2(KMsgErrorGetParameter, &KDuration);
 		StopTest(KErrNotFound, ETestSuiteError);
@@ -2660,7 +2660,7 @@
 		StopTest(KErrNotFound, ETestSuiteError);
 		return;
 		}
-	// Open file for recording using RFile 
+	// Open file for recording using RFile
 	TFileName fileNameType;
 	fileNameType.Copy(filename);
 	INFO_PRINTF2(_L("Opening file for recording %S"), &fileNameType);
@@ -2717,7 +2717,7 @@
 				{
 				INFO_PRINTF1(_L("DevSound Initialized to record audio."));
 				INFO_PRINTF1(_L("Calling iMMFDevSound->RecordInitL()"));
-				TRAPD(err, iMMFDevSound->RecordInitL()); 
+				TRAPD(err, iMMFDevSound->RecordInitL());
 				if (err != KErrNone)
 					{
 					ERR_PRINTF2(_L("DevSound RecordInitL left with error = %d"), err);
@@ -2727,7 +2727,7 @@
 				else
 					{
 					INFO_PRINTF2(_L("Starting timer %d uS"), (iDuration * KMicroSecsInOneSec));
-					StartTimer((iDuration * KMicroSecsInOneSec));		
+					StartTimer((iDuration * KMicroSecsInOneSec));
 					}
 				INFO_PRINTF1(_L("DevSound State: EStateRecording"));
 				iDevSoundState = EStateRecording;
@@ -2750,7 +2750,7 @@
 				{
 				// Write buffer to file
 				INFO_PRINTF1(_L("Writing data to file"));
-				CMMFDataBuffer* buffer = static_cast <CMMFDataBuffer*> (iBuffer);			
+				CMMFDataBuffer* buffer = static_cast <CMMFDataBuffer*> (iBuffer);
 				iAsyncWriteBTFAO->Start(buffer);
 				}
 			else if(aDevSoundEvent == EEventTimerComplete)
@@ -2771,7 +2771,7 @@
 				{
 				if (aDevSoundEvent == EEventBTBE)
 					{
-					CMMFDataBuffer* buffer = static_cast <CMMFDataBuffer*> (iBuffer);			
+					CMMFDataBuffer* buffer = static_cast <CMMFDataBuffer*> (iBuffer);
 					iAsyncWriteBTFAO->Start(buffer);
 					}
 				else
@@ -2824,7 +2824,7 @@
  * MM-A3F-DEVSOUND-CHRTZ-REC-RAW-0023
  */
 RA3FDevSoundQueryRecordConfigWhileRecordingTest::RA3FDevSoundQueryRecordConfigWhileRecordingTest(const TDesC& aTestName)
-	:	RA3FDevSoundTestBase(aTestName), iDuration(0), 
+	:	RA3FDevSoundTestBase(aTestName), iDuration(0),
 		iQueryRecordingSettings(EFalse), iExCapRate(0),
 		iExCapChannels(0)
 	{
@@ -2838,7 +2838,7 @@
 
 void RA3FDevSoundQueryRecordConfigWhileRecordingTest::DoKickoffTestL()
 	{
-	if ( !GetIntFromConfig(iTestStepName, KDuration, iDuration) ) 
+	if ( !GetIntFromConfig(iTestStepName, KDuration, iDuration) )
 		{
 		ERR_PRINTF2(KMsgErrorGetParameter, &KDuration);
 		StopTest(KErrNotFound, ETestSuiteError);
@@ -2851,7 +2851,7 @@
 		StopTest(KErrNotFound, ETestSuiteError);
 		return;
 		}
-	// Open file for recording using RFile 
+	// Open file for recording using RFile
 	TFileName fileNameType;
 	fileNameType.Copy(filename);
 	INFO_PRINTF2(_L("Opening file for recording %S"), &fileNameType);
@@ -2920,7 +2920,7 @@
 				{
 				INFO_PRINTF1(_L("DevSound Initialized to record audio."));
 				INFO_PRINTF1(_L("Calling iMMFDevSound->RecordInitL()"));
-				TRAPD(err, iMMFDevSound->RecordInitL()); 
+				TRAPD(err, iMMFDevSound->RecordInitL());
 				if (err != KErrNone)
 					{
 					ERR_PRINTF2(_L("DevSound RecordInitL left with error = %d"), err);
@@ -2930,7 +2930,7 @@
 				else
 					{
 					INFO_PRINTF2(_L("Starting timer %d uS"), (iDuration * KMicroSecsInOneSec));
-					StartTimer((iDuration * KMicroSecsInOneSec));		
+					StartTimer((iDuration * KMicroSecsInOneSec));
 					}
 				INFO_PRINTF1(_L("DevSound State: EStateRecording"));
 				iDevSoundState = EStateRecording;
@@ -3045,7 +3045,7 @@
  * MM-A3F-DEVSOUND-CHRTZ-REC-RAW-0024
  */
 RA3FDevSoundQueryRecordBalanceWhileRecordingTest::RA3FDevSoundQueryRecordBalanceWhileRecordingTest(const TDesC& aTestName)
-	:	RA3FDevSoundTestBase(aTestName), iDuration(0), 
+	:	RA3FDevSoundTestBase(aTestName), iDuration(0),
 		iQueryRecordingSettings(EFalse),
 		iExLRecordBalance(0),
 		iExRRecordBalance(0)
@@ -3072,7 +3072,7 @@
 		StopTest(KErrNotFound);
 		return;
 		}
-	if ( !GetIntFromConfig(iTestStepName, KDuration, iDuration) ) 
+	if ( !GetIntFromConfig(iTestStepName, KDuration, iDuration) )
 		{
 		ERR_PRINTF2(KMsgErrorGetParameter, &KDuration);
 		StopTest(KErrNotFound, ETestSuiteError);
@@ -3085,7 +3085,7 @@
 		StopTest(KErrNotFound, ETestSuiteError);
 		return;
 		}
-	// Open file for recording using RFile 
+	// Open file for recording using RFile
 	TFileName fileNameType;
 	fileNameType.Copy(filename);
 	INFO_PRINTF2(_L("Opening file for recording %S"), &fileNameType);
@@ -3142,7 +3142,7 @@
 				{
 				INFO_PRINTF1(_L("DevSound Initialized to record audio."));
 				INFO_PRINTF1(_L("Calling iMMFDevSound->RecordInitL()"));
-				TRAPD(err, iMMFDevSound->RecordInitL()); 
+				TRAPD(err, iMMFDevSound->RecordInitL());
 				if (err != KErrNone)
 					{
 					ERR_PRINTF2(_L("DevSound RecordInitL left with error = %d"), err);
@@ -3152,7 +3152,7 @@
 				else
 					{
 					INFO_PRINTF2(_L("Starting timer %d uS"), (iDuration * KMicroSecsInOneSec));
-					StartTimer((iDuration * KMicroSecsInOneSec));		
+					StartTimer((iDuration * KMicroSecsInOneSec));
 					}
 				INFO_PRINTF1(_L("DevSound State: EStateRecording"));
 				iDevSoundState = EStateRecording;
@@ -3175,7 +3175,7 @@
 				{
 				// Write buffer to file
 				INFO_PRINTF1(_L("Writing data to file"));
-				CMMFDataBuffer* buffer = static_cast <CMMFDataBuffer*> (iBuffer);			
+				CMMFDataBuffer* buffer = static_cast <CMMFDataBuffer*> (iBuffer);
 				iAsyncWriteBTFAO->Start(buffer);
 				}
 			else if(aDevSoundEvent == EEventTimerComplete)
@@ -3196,7 +3196,7 @@
 				{
 				if (aDevSoundEvent == EEventBTBE)
 					{
-					CMMFDataBuffer* buffer = static_cast <CMMFDataBuffer*> (iBuffer);			
+					CMMFDataBuffer* buffer = static_cast <CMMFDataBuffer*> (iBuffer);
 					iAsyncWriteBTFAO->Start(buffer);
 					}
 				else
@@ -3220,7 +3220,7 @@
 	if(!iQueryRecordingSettings)
 		{
 		INFO_PRINTF1(_L("Calling query method GetRecordBalanceL() while recording"));
-		
+
 		TInt getLRecordBalance = 0;
 		TInt getRRecordBalance = 0;
 		TRAPD(err, iMMFDevSound->GetRecordBalanceL(getLRecordBalance, getRRecordBalance));
@@ -3256,7 +3256,7 @@
  * MM-A3F-DEVSOUND-CHRTZ-REC-RAW-0025
  */
 RA3FDevSoundQueryRecordSupportedOutputDataTypesWhileRecordingTest::RA3FDevSoundQueryRecordSupportedOutputDataTypesWhileRecordingTest(const TDesC& aTestName)
-	:	RA3FDevSoundTestBase(aTestName), iDuration(0), 
+	:	RA3FDevSoundTestBase(aTestName), iDuration(0),
 		iQueryRecordingSettings(EFalse),
 		iCurrentTypeInTest(0)
 	{
@@ -3270,7 +3270,7 @@
 
 void RA3FDevSoundQueryRecordSupportedOutputDataTypesWhileRecordingTest::DoKickoffTestL()
 	{
-	if ( !GetIntFromConfig(iTestStepName, KDuration, iDuration) ) 
+	if ( !GetIntFromConfig(iTestStepName, KDuration, iDuration) )
 		{
 		ERR_PRINTF2(KMsgErrorGetParameter, &KDuration);
 		StopTest(KErrNotFound, ETestSuiteError);
@@ -3283,7 +3283,7 @@
 		StopTest(KErrNotFound, ETestSuiteError);
 		return;
 		}
-	// Open file for recording using RFile 
+	// Open file for recording using RFile
 	TFileName fileNameType;
 	fileNameType.Copy(filename);
 	INFO_PRINTF2(_L("Opening file for recording %S"), &fileNameType);
@@ -3342,7 +3342,7 @@
 					{
 					INFO_PRINTF1(_L("DevSound Initialized to record audio."));
 					INFO_PRINTF1(_L("Calling iMMFDevSound->RecordInitL()"));
-					TRAPD(err, iMMFDevSound->RecordInitL()); 
+					TRAPD(err, iMMFDevSound->RecordInitL());
 					if (err != KErrNone)
 						{
 						ERR_PRINTF2(_L("DevSound RecordInitL left with error = %d"), err);
@@ -3403,7 +3403,7 @@
 				{
 				// Write buffer to file
 				INFO_PRINTF1(_L("Writing data to file"));
-				CMMFDataBuffer* buffer = static_cast <CMMFDataBuffer*> (iBuffer);			
+				CMMFDataBuffer* buffer = static_cast <CMMFDataBuffer*> (iBuffer);
 				iAsyncWriteBTFAO->Start(buffer);
 				}
 			else if(aDevSoundEvent == EEventTimerComplete)
@@ -3424,7 +3424,7 @@
 				{
 				if (aDevSoundEvent == EEventBTBE)
 					{
-					CMMFDataBuffer* buffer = static_cast <CMMFDataBuffer*> (iBuffer);			
+					CMMFDataBuffer* buffer = static_cast <CMMFDataBuffer*> (iBuffer);
 					iAsyncWriteBTFAO->Start(buffer);
 					}
 				else
@@ -3448,7 +3448,7 @@
 	if(!iQueryRecordingSettings)
 		{
 		INFO_PRINTF1(_L("Calling query method GetSupportedOutputDataTypesL() while recording"));
-		
+
 		TMMFPrioritySettings prioritySettings;
 		TRAPD(err,iMMFDevSound->GetSupportedOutputDataTypesL(iSupportedFourCCs,prioritySettings));
 		if (err != KErrNone)
@@ -3467,9 +3467,9 @@
 				}
 			INFO_PRINTF3(_L("Supported Input Data types: 0x%x  %S "), fourCC.FourCC(), &name);
 			}
-		
+
 		iQueryRecordingSettings = ETrue;
-		
+
 		}
 	else
 		{
@@ -3510,7 +3510,7 @@
 		{
 		INFO_PRINTF1(_L("DevSound Event: EEventBTBE"));
 		Fsm(EEventBTBE, KErrNone);
-		}	
+		}
 	}
 
 /*
@@ -3518,7 +3518,7 @@
  * MM-A3F-DEVSOUND-CHRTZ-REC-RAW-0026
  */
 RA3FDevSoundQueryRecordMaxGainWhileRecordingTest::RA3FDevSoundQueryRecordMaxGainWhileRecordingTest(const TDesC& aTestName)
-	:	RA3FDevSoundTestBase(aTestName), iDuration(0), 
+	:	RA3FDevSoundTestBase(aTestName), iDuration(0),
 		iQueryRecordingSettings(EFalse),
 		iExGain(0)
 	{
@@ -3538,7 +3538,7 @@
 		StopTest(KErrNotFound);
 		return;
 		}
-	if ( !GetIntFromConfig(iTestStepName, KDuration, iDuration) ) 
+	if ( !GetIntFromConfig(iTestStepName, KDuration, iDuration) )
 		{
 		ERR_PRINTF2(KMsgErrorGetParameter, &KDuration);
 		StopTest(KErrNotFound, ETestSuiteError);
@@ -3551,7 +3551,7 @@
 		StopTest(KErrNotFound, ETestSuiteError);
 		return;
 		}
-	// Open file for recording using RFile 
+	// Open file for recording using RFile
 	TFileName fileNameType;
 	fileNameType.Copy(filename);
 	INFO_PRINTF2(_L("Opening file for recording %S"), &fileNameType);
@@ -3608,7 +3608,7 @@
 				{
 				INFO_PRINTF1(_L("DevSound Initialized to record audio."));
 				INFO_PRINTF1(_L("Calling iMMFDevSound->RecordInitL()"));
-				TRAPD(err, iMMFDevSound->RecordInitL()); 
+				TRAPD(err, iMMFDevSound->RecordInitL());
 				if (err != KErrNone)
 					{
 					ERR_PRINTF2(_L("DevSound RecordInitL left with error = %d"), err);
@@ -3618,7 +3618,7 @@
 				else
 					{
 					INFO_PRINTF2(_L("Starting timer %d uS"), (iDuration * KMicroSecsInOneSec));
-					StartTimer((iDuration * KMicroSecsInOneSec));		
+					StartTimer((iDuration * KMicroSecsInOneSec));
 					}
 				INFO_PRINTF1(_L("DevSound State: EStateRecording"));
 				iDevSoundState = EStateRecording;
@@ -3641,7 +3641,7 @@
 				{
 				// Write buffer to file
 				INFO_PRINTF1(_L("Writing data to file"));
-				CMMFDataBuffer* buffer = static_cast <CMMFDataBuffer*> (iBuffer);			
+				CMMFDataBuffer* buffer = static_cast <CMMFDataBuffer*> (iBuffer);
 				iAsyncWriteBTFAO->Start(buffer);
 				}
 			else if(aDevSoundEvent == EEventTimerComplete)
@@ -3662,7 +3662,7 @@
 				{
 				if (aDevSoundEvent == EEventBTBE)
 					{
-					CMMFDataBuffer* buffer = static_cast <CMMFDataBuffer*> (iBuffer);			
+					CMMFDataBuffer* buffer = static_cast <CMMFDataBuffer*> (iBuffer);
 					iAsyncWriteBTFAO->Start(buffer);
 					}
 				else
@@ -3686,7 +3686,7 @@
 	if(!iQueryRecordingSettings)
 		{
 		INFO_PRINTF1(_L("Calling query method MaxGain() while recording"));
-		
+
 		TInt maxGain = iMMFDevSound->MaxGain();
 		INFO_PRINTF2(_L("Record Max Gain  %d"), maxGain);
 		if(maxGain == iExGain)
@@ -3713,7 +3713,7 @@
  * MM-A3F-DEVSOUND-CHRTZ-REC-RAW-0027
  */
 RA3FDevSoundQueryRecordSamplesRecordedWhileRecordingTest::RA3FDevSoundQueryRecordSamplesRecordedWhileRecordingTest(const TDesC& aTestName)
-	:	RA3FDevSoundTestBase(aTestName), iDuration(0), 
+	:	RA3FDevSoundTestBase(aTestName), iDuration(0),
 		iQueryRecordingSettings(EFalse)
 	{
 	}
@@ -3726,7 +3726,7 @@
 
 void RA3FDevSoundQueryRecordSamplesRecordedWhileRecordingTest::DoKickoffTestL()
 	{
-	if ( !GetIntFromConfig(iTestStepName, KDuration, iDuration) ) 
+	if ( !GetIntFromConfig(iTestStepName, KDuration, iDuration) )
 		{
 		ERR_PRINTF2(KMsgErrorGetParameter, &KDuration);
 		StopTest(KErrNotFound, ETestSuiteError);
@@ -3739,7 +3739,7 @@
 		StopTest(KErrNotFound, ETestSuiteError);
 		return;
 		}
-	// Open file for recording using RFile 
+	// Open file for recording using RFile
 	TFileName fileNameType;
 	fileNameType.Copy(filename);
 	INFO_PRINTF2(_L("Opening file for recording %S"), &fileNameType);
@@ -3796,7 +3796,7 @@
 				{
 				INFO_PRINTF1(_L("DevSound Initialized to record audio."));
 				INFO_PRINTF1(_L("Calling iMMFDevSound->RecordInitL()"));
-				TRAPD(err, iMMFDevSound->RecordInitL()); 
+				TRAPD(err, iMMFDevSound->RecordInitL());
 				if (err != KErrNone)
 					{
 					ERR_PRINTF2(_L("DevSound RecordInitL left with error = %d"), err);
@@ -3806,7 +3806,7 @@
 				else
 					{
 					INFO_PRINTF2(_L("Starting timer %d uS"), (iDuration * KMicroSecsInOneSec));
-					StartTimer((iDuration * KMicroSecsInOneSec));		
+					StartTimer((iDuration * KMicroSecsInOneSec));
 					}
 				INFO_PRINTF1(_L("DevSound State: EStateRecording"));
 				iDevSoundState = EStateRecording;
@@ -3829,7 +3829,7 @@
 				{
 				// Write buffer to file
 				INFO_PRINTF1(_L("Writing data to file"));
-				CMMFDataBuffer* buffer = static_cast <CMMFDataBuffer*> (iBuffer);			
+				CMMFDataBuffer* buffer = static_cast <CMMFDataBuffer*> (iBuffer);
 				iAsyncWriteBTFAO->Start(buffer);
 				}
 			else if(aDevSoundEvent == EEventTimerComplete)
@@ -3850,7 +3850,7 @@
 				{
 				if (aDevSoundEvent == EEventBTBE)
 					{
-					CMMFDataBuffer* buffer = static_cast <CMMFDataBuffer*> (iBuffer);			
+					CMMFDataBuffer* buffer = static_cast <CMMFDataBuffer*> (iBuffer);
 					iAsyncWriteBTFAO->Start(buffer);
 					}
 				else
@@ -3874,7 +3874,7 @@
 	if(!iQueryRecordingSettings)
 		{
 		INFO_PRINTF1(_L("Calling query method SamplesRecorded() while recording"));
-		
+
 		TInt samplesRecorded = iMMFDevSound->SamplesRecorded();
 		INFO_PRINTF2(_L("Samples Recorded  %d"), samplesRecorded);
 		if(samplesRecorded > 0)
@@ -3887,7 +3887,7 @@
 			StopTest(KErrNone, EFail);
 			}
 		iQueryRecordingSettings = ETrue;
-		
+
 		}
 	else
 		{
@@ -3902,7 +3902,7 @@
  * MM-A3F-DEVSOUND-CHRTZ-REC-RAW-0028
  */
 RA3FDevSoundQueryRecordGainWhileRecordingTest::RA3FDevSoundQueryRecordGainWhileRecordingTest(const TDesC& aTestName)
-	:	RA3FDevSoundTestBase(aTestName), iDuration(0), 
+	:	RA3FDevSoundTestBase(aTestName), iDuration(0),
 		iQueryRecordingSettings(EFalse)
 	{
 	}
@@ -3915,7 +3915,7 @@
 
 void RA3FDevSoundQueryRecordGainWhileRecordingTest::DoKickoffTestL()
 	{
-	if ( !GetIntFromConfig(iTestStepName, KDuration, iDuration) ) 
+	if ( !GetIntFromConfig(iTestStepName, KDuration, iDuration) )
 		{
 		ERR_PRINTF2(KMsgErrorGetParameter, &KDuration);
 		StopTest(KErrNotFound, ETestSuiteError);
@@ -3928,7 +3928,7 @@
 		StopTest(KErrNotFound, ETestSuiteError);
 		return;
 		}
-	// Open file for recording using RFile 
+	// Open file for recording using RFile
 	TFileName fileNameType;
 	fileNameType.Copy(filename);
 	INFO_PRINTF2(_L("Opening file for recording %S"), &fileNameType);
@@ -3985,7 +3985,7 @@
 				{
 				INFO_PRINTF1(_L("DevSound Initialized to record audio."));
 				INFO_PRINTF1(_L("Calling iMMFDevSound->RecordInitL()"));
-				TRAPD(err, iMMFDevSound->RecordInitL()); 
+				TRAPD(err, iMMFDevSound->RecordInitL());
 				if (err != KErrNone)
 					{
 					ERR_PRINTF2(_L("DevSound RecordInitL left with error = %d"), err);
@@ -3995,7 +3995,7 @@
 				else
 					{
 					INFO_PRINTF2(_L("Starting timer %d uS"), (iDuration * KMicroSecsInOneSec));
-					StartTimer((iDuration * KMicroSecsInOneSec));		
+					StartTimer((iDuration * KMicroSecsInOneSec));
 					}
 				INFO_PRINTF1(_L("DevSound State: EStateRecording"));
 				iDevSoundState = EStateRecording;
@@ -4018,7 +4018,7 @@
 				{
 				// Write buffer to file
 				INFO_PRINTF1(_L("Writing data to file"));
-				CMMFDataBuffer* buffer = static_cast <CMMFDataBuffer*> (iBuffer);			
+				CMMFDataBuffer* buffer = static_cast <CMMFDataBuffer*> (iBuffer);
 				iAsyncWriteBTFAO->Start(buffer);
 				}
 			else if(aDevSoundEvent == EEventTimerComplete)
@@ -4039,7 +4039,7 @@
 				{
 				if (aDevSoundEvent == EEventBTBE)
 					{
-					CMMFDataBuffer* buffer = static_cast <CMMFDataBuffer*> (iBuffer);			
+					CMMFDataBuffer* buffer = static_cast <CMMFDataBuffer*> (iBuffer);
 					iAsyncWriteBTFAO->Start(buffer);
 					}
 				else
@@ -4063,9 +4063,9 @@
 	if(!iQueryRecordingSettings)
 		{
 		INFO_PRINTF1(_L("Calling query method Gain() while recording"));
-		
+
 		INFO_PRINTF2(_L("Current Gain = %d"), iMMFDevSound->Gain());
-		if(iMMFDevSound->Gain() == iMMFDevSound->MaxGain()/2)
+		if(iMMFDevSound->Gain() == (iMMFDevSound->MaxGain()+1)/2)
 			{
 			INFO_PRINTF2(_L("Gain equals the expected default value of MaxGain/2 = %d"),iMMFDevSound->MaxGain()/2);
 			}
@@ -4075,7 +4075,7 @@
 			StopTest(KErrNone, EFail);
 			}
 		iQueryRecordingSettings = ETrue;
-		
+
 		}
 	else
 		{
@@ -4102,7 +4102,7 @@
 
 void RA3FDevSoundRecordingTest::DoKickoffTestL()
 	{
-	if ( !GetIntFromConfig(iTestStepName, KDuration, iDuration) ) 
+	if ( !GetIntFromConfig(iTestStepName, KDuration, iDuration) )
 		{
 		ERR_PRINTF2(KMsgErrorGetParameter, &KDuration);
 		StopTest(KErrNotFound, ETestSuiteError);
@@ -4115,7 +4115,7 @@
 		StopTest(KErrNotFound, ETestSuiteError);
 		return;
 		}
-	// Open file for recording using RFile 
+	// Open file for recording using RFile
 	TFileName fileNameType;
 	fileNameType.Copy(filename);
 	INFO_PRINTF2(_L("Opening file for recording %S"), &fileNameType);
@@ -4172,7 +4172,7 @@
 				{
 				INFO_PRINTF1(_L("DevSound Initialized to record audio."));
 				INFO_PRINTF1(_L("Calling iMMFDevSound->RecordInitL()"));
-				TRAPD(err, iMMFDevSound->RecordInitL()); 
+				TRAPD(err, iMMFDevSound->RecordInitL());
 				if (err != KErrNone)
 					{
 					ERR_PRINTF2(_L("DevSound RecordInitL left with error = %d"), err);
@@ -4182,7 +4182,7 @@
 				else
 					{
 					INFO_PRINTF2(_L("Starting timer %d uS"), (iDuration * KMicroSecsInOneSec));
-					StartTimer((iDuration * KMicroSecsInOneSec));		
+					StartTimer((iDuration * KMicroSecsInOneSec));
 					}
 				INFO_PRINTF1(_L("DevSound State: EStateRecording"));
 				iDevSoundState = EStateRecording;
@@ -4205,7 +4205,7 @@
 				{
 				// Write buffer to file
 				INFO_PRINTF1(_L("Writing data to file"));
-				CMMFDataBuffer* buffer = static_cast <CMMFDataBuffer*> (iBuffer);			
+				CMMFDataBuffer* buffer = static_cast <CMMFDataBuffer*> (iBuffer);
 				iAsyncWriteBTFAO->Start(buffer);
 				}
 			else if(aDevSoundEvent == EEventTimerComplete)
@@ -4226,7 +4226,7 @@
 				{
 				if (aDevSoundEvent == EEventBTBE)
 					{
-					CMMFDataBuffer* buffer = static_cast <CMMFDataBuffer*> (iBuffer);			
+					CMMFDataBuffer* buffer = static_cast <CMMFDataBuffer*> (iBuffer);
 					iAsyncWriteBTFAO->Start(buffer);
 					}
 				else
@@ -4257,8 +4257,8 @@
  * MM-A3F-DEVSOUND-CHRTZ-REC-RAW-0030
  */
 RA3FDevSoundLeavePauseStateToInitializedToRecordAudioTest::RA3FDevSoundLeavePauseStateToInitializedToRecordAudioTest(const TDesC& aTestName)
-	:	RA3FDevSoundTestBase(aTestName), 
-		iDuration(0), 
+	:	RA3FDevSoundTestBase(aTestName),
+		iDuration(0),
 		iRecordAgainToConfirmInitializedState(EFalse)
 	{
 	}
@@ -4271,7 +4271,7 @@
 
 void RA3FDevSoundLeavePauseStateToInitializedToRecordAudioTest::DoKickoffTestL()
 	{
-	if ( !GetIntFromConfig(iTestStepName, KDuration, iDuration) ) 
+	if ( !GetIntFromConfig(iTestStepName, KDuration, iDuration) )
 		{
 		ERR_PRINTF2(KMsgErrorGetParameter, &KDuration);
 		StopTest(KErrNotFound, ETestSuiteError);
@@ -4284,10 +4284,10 @@
 		StopTest(KErrNotFound, ETestSuiteError);
 		return;
 		}
-	// Open file for recording using RFile 
+	// Open file for recording using RFile
 	TFileName fileNameType;
 	fileNameType.Copy(filename);
-	
+
 	INFO_PRINTF2(_L("Opening file for recording %S"), &fileNameType);
 	TInt err = iFile.Replace(iFs, fileNameType, EFileWrite);
 	if (err != KErrNone)
@@ -4342,7 +4342,7 @@
 				{
 				INFO_PRINTF1(_L("DevSound Initialized to record audio."));
 				INFO_PRINTF1(_L("Calling iMMFDevSound->RecordInitL()"));
-				TRAPD(err, iMMFDevSound->RecordInitL()); 
+				TRAPD(err, iMMFDevSound->RecordInitL());
 				if (err != KErrNone)
 					{
 					ERR_PRINTF2(_L("DevSound RecordInitL left with error = %d"), err);
@@ -4352,7 +4352,7 @@
 				else
 					{
 					INFO_PRINTF2(_L("Starting timer %d uS"), (iDuration * KMicroSecsInOneSec));
-					StartTimer((iDuration * KMicroSecsInOneSec));		
+					StartTimer((iDuration * KMicroSecsInOneSec));
 					}
 				INFO_PRINTF1(_L("DevSound State: EStateRecording"));
 				iDevSoundState = EStateRecording;
@@ -4460,7 +4460,7 @@
 				{
 				INFO_PRINTF1(_L("To test whether or not Devsound is in the initialized state, a new record process is launched"));
 				INFO_PRINTF1(_L("iMMFDevSound->RecordInitL()"));
-				TRAPD(err, iMMFDevSound->RecordInitL()); 
+				TRAPD(err, iMMFDevSound->RecordInitL());
 				if (err != KErrNone)
 					{
 					ERR_PRINTF2(_L("DevSound RecordInitL left with error = %d"), err);
@@ -4471,7 +4471,7 @@
 				iDevSoundState = EStateRecording;
 				iRecordAgainToConfirmInitializedState = ETrue;
 				INFO_PRINTF2(_L("Starting timer %d uS"), (iDuration * KMicroSecsInOneSec));
-				StartTimer(iDuration * KMicroSecsInOneSec);		
+				StartTimer(iDuration * KMicroSecsInOneSec);
 				}
 			else
 				{
@@ -4496,7 +4496,7 @@
  * MM-A3F-DEVSOUND-CHRTZ-REC-RAW-0031
  */
 RA3FDevSoundRecordPreemptionTest::RA3FDevSoundRecordPreemptionTest(const TDesC& aTestName)
-	:	RA3FDevSoundTestBase(aTestName), 
+	:	RA3FDevSoundTestBase(aTestName),
 		iDuration(0),
 		iOtherClientStarted(EFalse),
 		iOtherFilename(KNullDesC),
@@ -4512,7 +4512,7 @@
 
 void RA3FDevSoundRecordPreemptionTest::DoKickoffTestL()
 	{
-	if ( !GetIntFromConfig(iTestStepName, KDuration, iDuration) ) 
+	if ( !GetIntFromConfig(iTestStepName, KDuration, iDuration) )
 		{
 		ERR_PRINTF2(KMsgErrorGetParameter, &KDuration);
 		StopTest(KErrNotFound, ETestSuiteError);
@@ -4525,7 +4525,7 @@
 		StopTest(KErrNotFound, ETestSuiteError);
 		return;
 		}
-	// Open file for recording using RFile 
+	// Open file for recording using RFile
 	TFileName fileNameType;
 	fileNameType.Copy(filename);
 	// Get the filename of the second audio file to record
@@ -4591,7 +4591,7 @@
 			if (aDevSoundEvent == EEventInitComplete && aError == KErrNone)
 				{
 				INFO_PRINTF1(_L("iMMFDevSound->RecordInitL()"));
-				TRAPD(err, iMMFDevSound->RecordInitL()); 
+				TRAPD(err, iMMFDevSound->RecordInitL());
 				if (err != KErrNone)
 					{
 					ERR_PRINTF2(_L("DevSound RecordInitL left with error = %d"), err);
@@ -4601,7 +4601,7 @@
 				else
 					{
 					INFO_PRINTF2(_L("Starting timer %d uS"), (iDuration * KMicroSecsInOneSec));
-					StartTimer((iDuration * KMicroSecsInOneSec));		
+					StartTimer((iDuration * KMicroSecsInOneSec));
 					}
 				INFO_PRINTF1(_L("DevSound State: EStateRecording"));
 				iDevSoundState = EStateRecording;
@@ -4668,7 +4668,7 @@
 	INFO_PRINTF1(_L("TimerEvent called"));
 	if(!iOtherClientStarted)
 		{
-		INFO_PRINTF1(_L("Initializing higher priority devsound client..."));	
+		INFO_PRINTF1(_L("Initializing higher priority devsound client..."));
 		iDevsoundRecordClient->SetPriority(KMaximumPriority);
 		TInt err = iDevsoundRecordClient->InitializeRecordClient(iOtherFilename);
 		if (err != KErrNone)
@@ -4719,12 +4719,12 @@
 		{
 		INFO_PRINTF1(_L("Second DevSound instance called BufferToBeEmptied."));
 		}
-	else if(iOtherClientStarted && aError == KErrGeneral) 
+	else if(iOtherClientStarted && aError == KErrGeneral)
 		{
 		INFO_PRINTF1(_L("Second DevSound instance BufferToBeEmptied callback received a NULL CMMFBuffer"));
 		StopTest(aError);
 		}
-	if(iOtherClientStarted && aError == KErrUnknown) 
+	if(iOtherClientStarted && aError == KErrUnknown)
 		{
 		INFO_PRINTF1(_L("***** Second DevSound instance :Unknown behaviour: Last buffer flag set before calling CMMFDevSound->Pause()"));
 		StopTest(aError);
@@ -4766,7 +4766,7 @@
 	if (aError == KErrUnderflow)
 		{
 		ERR_PRINTF1(_L("First instance of DevSound was not preempted"));
-		StopTest(aError);	
+		StopTest(aError);
 		}
 	else if(aError == KErrInUse || aError == KErrDied || aError == KErrAccessDenied)
 		{
@@ -4777,14 +4777,14 @@
 		ERR_PRINTF2(_L("First instance of DevSound called RecordError() with unexpected error code: %d"), aError);
 		StopTest(aError, EFail);
 		}
-	}	
+	}
 
 /*
  *========================================================================================================
  * MM-A3F-DEVSOUND-CHRTZ-REC-RAW-0032
  */
 RA3FDevSoundRecordRejectionTest::RA3FDevSoundRecordRejectionTest(const TDesC& aTestName)
-	:	RA3FDevSoundTestBase(aTestName), 
+	:	RA3FDevSoundTestBase(aTestName),
 		iDuration(0), iOtherClientStarted(EFalse),
 		iOtherFilename(KNullDesC)
 	{
@@ -4798,7 +4798,7 @@
 
 void RA3FDevSoundRecordRejectionTest::DoKickoffTestL()
 	{
-	if ( !GetIntFromConfig(iTestStepName, KDuration, iDuration) ) 
+	if ( !GetIntFromConfig(iTestStepName, KDuration, iDuration) )
 		{
 		ERR_PRINTF2(KMsgErrorGetParameter, &KDuration);
 		StopTest(KErrNotFound, ETestSuiteError);
@@ -4811,7 +4811,7 @@
 		StopTest(KErrNotFound, ETestSuiteError);
 		return;
 		}
-	// Open file for recording using RFile 
+	// Open file for recording using RFile
 	TFileName fileNameType;
 	fileNameType.Copy(filename);
 	// Get the filename of the second audio file to record
@@ -4877,7 +4877,7 @@
 			if (aDevSoundEvent == EEventInitComplete && aError == KErrNone)
 				{
 				INFO_PRINTF1(_L("iMMFDevSound->RecordInitL()"));
-				TRAPD(err, iMMFDevSound->RecordInitL()); 
+				TRAPD(err, iMMFDevSound->RecordInitL());
 				if (err != KErrNone)
 					{
 					ERR_PRINTF2(_L("DevSound RecordInitL left with error = %d"), err);
@@ -4887,7 +4887,7 @@
 				else
 					{
 					INFO_PRINTF2(_L("Starting timer %d uS"), (iDuration * KMicroSecsInOneSec));
-					StartTimer((iDuration * KMicroSecsInOneSec));		
+					StartTimer((iDuration * KMicroSecsInOneSec));
 					}
 				INFO_PRINTF1(_L("DevSound State: EStateRecording"));
 				iDevSoundState = EStateRecording;
@@ -4954,7 +4954,7 @@
 	INFO_PRINTF1(_L("TimerEvent called"));
 	if(!iOtherClientStarted)
 		{
-		INFO_PRINTF1(_L("Starting lower priority devsound client..."));	
+		INFO_PRINTF1(_L("Starting lower priority devsound client..."));
 		iDevsoundRecordClient->SetPriority(KMinimumPriority);
 		TInt err = iDevsoundRecordClient->InitializeRecordClient(iOtherFilename);
 		if (err != KErrNone)
@@ -5016,7 +5016,7 @@
 	{
 	INFO_PRINTF2(_L("In rejection, BufferToBeEmptied Callback of 2nd DevSound client should not be called %d"), aError);
 	StopTest(aError, EFail);
-	}	
+	}
 
 /*
  *========================================================================================================
@@ -5077,7 +5077,7 @@
 			if (aDevSoundEvent == EEventInitComplete && aError == KErrNone)
 				{
 				INFO_PRINTF1(_L("DevSound Initialized to record audio."));
-		
+
 				INFO_PRINTF1(_L("Calling RecordData without RecordInitL"));
 				iMMFDevSound->RecordData();
 				StopTest(KErrNone, EFail);
@@ -5119,7 +5119,7 @@
 
 void RA3FDevSoundRecordCallingRecordInitLMoreThanOnceTest::DoKickoffTestL()
 	{
-	if ( !GetIntFromConfig(iTestStepName, KDuration, iDuration) ) 
+	if ( !GetIntFromConfig(iTestStepName, KDuration, iDuration) )
 		{
 		ERR_PRINTF2(KMsgErrorGetParameter, &KDuration);
 		StopTest(KErrNotFound, ETestSuiteError);
@@ -5132,7 +5132,7 @@
 		StopTest(KErrNotFound, ETestSuiteError);
 		return;
 		}
-	// Open file for recording using RFile 
+	// Open file for recording using RFile
 	TFileName fileNameType;
 	fileNameType.Copy(filename);
 	INFO_PRINTF2(_L("Opening file for recording %S"), &fileNameType);
@@ -5189,7 +5189,7 @@
 				{
 				INFO_PRINTF1(_L("DevSound Initialized to record audio."));
 				INFO_PRINTF1(_L("Calling iMMFDevSound->RecordInitL()"));
-				TRAPD(err, iMMFDevSound->RecordInitL()); 
+				TRAPD(err, iMMFDevSound->RecordInitL());
 				if (err != KErrNone)
 					{
 					ERR_PRINTF2(_L("DevSound RecordInitL left with error = %d"), err);
@@ -5199,13 +5199,13 @@
 				else
 					{
 					INFO_PRINTF2(_L("Starting timer %d uS"), (iDuration * KMicroSecsInOneSec));
-					StartTimer((iDuration * KMicroSecsInOneSec));		
+					StartTimer((iDuration * KMicroSecsInOneSec));
 					}
 				INFO_PRINTF1(_L("DevSound State: EStateRecording"));
 				iDevSoundState = EStateRecording;
-				
+
 				INFO_PRINTF1(_L("Second call to iMMFDevSound->RecordInitL()"));
-				TRAP(err, iMMFDevSound->RecordInitL()); 
+				TRAP(err, iMMFDevSound->RecordInitL());
 				if (err == KErrNotReady)
 					{
 					ERR_PRINTF2(_L("DevSound RecordInitL was called more than once, error is the expected= %d"), err);
@@ -5236,7 +5236,7 @@
 				{
 				// Write buffer to file
 				INFO_PRINTF1(_L("Writing data to file"));
-				CMMFDataBuffer* buffer = static_cast <CMMFDataBuffer*> (iBuffer);			
+				CMMFDataBuffer* buffer = static_cast <CMMFDataBuffer*> (iBuffer);
 				iAsyncWriteBTFAO->Start(buffer);
 				}
 			else if(aDevSoundEvent == EEventTimerComplete)
@@ -5257,7 +5257,7 @@
 				{
 				if (aDevSoundEvent == EEventBTBE)
 					{
-					CMMFDataBuffer* buffer = static_cast <CMMFDataBuffer*> (iBuffer);			
+					CMMFDataBuffer* buffer = static_cast <CMMFDataBuffer*> (iBuffer);
 					iAsyncWriteBTFAO->Start(buffer);
 					}
 				else
@@ -5283,6 +5283,6 @@
 	Fsm(EEventTimerComplete, KErrNone);
 	}
 
-	
-
-
+
+
+