--- a/accessoryservices/accessorymonitor/tsrc/public/basic/accmonitoringtestmodule/tests/init/accmonitoringtestmodule_exe.ini	Fri Jun 11 14:56:08 2010 +0300
+++ b/accessoryservices/accessorymonitor/tsrc/public/basic/accmonitoringtestmodule/tests/init/accmonitoringtestmodule_exe.ini	Thu Jul 01 11:20:10 2010 +0300
@@ -1,3 +1,3 @@
-[StifSettings]
-CapsModifier= accMonitoringTestModule.exe
-[EndStifSettings]
+[StifSettings]
+CapsModifier= accMonitoringTestModule.exe
+[EndStifSettings]

--- a/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dosservercontrol/BMARM/DOSSERVERCONTROLU.DEF	Fri Jun 11 14:56:08 2010 +0300
+++ b/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dosservercontrol/BMARM/DOSSERVERCONTROLU.DEF	Thu Jul 01 11:20:10 2010 +0300
@@ -1,4 +1,4 @@
-EXPORTS
-	ImplementationGroupProxy__FRi @ 1 NONAME R3UNUSED ; ImplementationGroupProxy(int &)
-	GetDosServerControl__Fv @ 2 NONAME R3UNUSED ; GetDosServerControl(void)
-
+EXPORTS
+	ImplementationGroupProxy__FRi @ 1 NONAME R3UNUSED ; ImplementationGroupProxy(int &)
+	GetDosServerControl__Fv @ 2 NONAME R3UNUSED ; GetDosServerControl(void)
+

--- a/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dosservercontrol/BWINS/DOSSERVERCONTROLU.DEF	Fri Jun 11 14:56:08 2010 +0300
+++ b/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dosservercontrol/BWINS/DOSSERVERCONTROLU.DEF	Thu Jul 01 11:20:10 2010 +0300
@@ -1,4 +1,4 @@
-EXPORTS
-	?ImplementationGroupProxy@@YAPBUTImplementationProxy@@AAH@Z @ 1 NONAME ; struct TImplementationProxy const * __cdecl ImplementationGroupProxy(int &)
-	?GetDosServerControl@@YAPAVMTFDosServerControl@@XZ @ 2 NONAME ; class MTFDosServerControl * __cdecl GetDosServerControl(void)
-
+EXPORTS
+	?ImplementationGroupProxy@@YAPBUTImplementationProxy@@AAH@Z @ 1 NONAME ; struct TImplementationProxy const * __cdecl ImplementationGroupProxy(int &)
+	?GetDosServerControl@@YAPAVMTFDosServerControl@@XZ @ 2 NONAME ; class MTFDosServerControl * __cdecl GetDosServerControl(void)
+

--- a/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dosservercontrol/EABI/dosservercontrolU.DEF	Fri Jun 11 14:56:08 2010 +0300
+++ b/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dosservercontrol/EABI/dosservercontrolU.DEF	Thu Jul 01 11:20:10 2010 +0300
@@ -1,5 +1,5 @@
-EXPORTS
-	_Z24ImplementationGroupProxyRi @ 1 NONAME
-	_Z19GetDosServerControlv @ 2 NONAME
-
-
+EXPORTS
+	_Z24ImplementationGroupProxyRi @ 1 NONAME
+	_Z19GetDosServerControlv @ 2 NONAME
+
+

--- a/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dosservercontrol/data/10200c6f.rss	Fri Jun 11 14:56:08 2010 +0300
+++ b/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dosservercontrol/data/10200c6f.rss	Thu Jul 01 11:20:10 2010 +0300
@@ -1,54 +1,54 @@
-/*
-* Copyright (c) 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:  Declaration of DOS server control ECom resource
-*
-*/
-
-
-// INCLUDE FILES
-#include "registryinfov2.rh"
-
-//  RESOURCE DEFINITIONS 
-// ---------------------------------------------------------
-//   
-//    DosServerControlPlugin
-//
-// ---------------------------------------------------------
-//
-RESOURCE REGISTRY_INFO DosServerControlPlugin
-	{
-	resource_format_version	= RESOURCE_FORMAT_VERSION_2;
-	dll_uid		= 0x10200c6f;
-	interfaces	= 
-		{
-		INTERFACE_INFO
-			{
-			interface_uid	= 0x10200c7d;
-			implementations = 
-				{
-				IMPLEMENTATION_INFO
-					{
-					implementation_uid	= 0x10200c77;
-					version_no			= 1;
-					display_name		= "DOSSERVERCONTROLPLUGIN";
-					default_data		= "DOSSERVERCONTROLPLUGIN";
-					opaque_data			= "";
-					rom_only			= 0;
-					}
-				};
-			}
-		};
-	}
-
-// End of File
+/*
+* Copyright (c) 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:  Declaration of DOS server control ECom resource
+*
+*/
+
+
+// INCLUDE FILES
+#include "registryinfov2.rh"
+
+//  RESOURCE DEFINITIONS 
+// ---------------------------------------------------------
+//   
+//    DosServerControlPlugin
+//
+// ---------------------------------------------------------
+//
+RESOURCE REGISTRY_INFO DosServerControlPlugin
+	{
+	resource_format_version	= RESOURCE_FORMAT_VERSION_2;
+	dll_uid		= 0x10200c6f;
+	interfaces	= 
+		{
+		INTERFACE_INFO
+			{
+			interface_uid	= 0x10200c7d;
+			implementations = 
+				{
+				IMPLEMENTATION_INFO
+					{
+					implementation_uid	= 0x10200c77;
+					version_no			= 1;
+					display_name		= "DOSSERVERCONTROLPLUGIN";
+					default_data		= "DOSSERVERCONTROLPLUGIN";
+					opaque_data			= "";
+					rom_only			= 0;
+					}
+				};
+			}
+		};
+	}
+
+// End of File

--- a/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dosservercontrol/group/bld.inf	Fri Jun 11 14:56:08 2010 +0300
+++ b/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dosservercontrol/group/bld.inf	Thu Jul 01 11:20:10 2010 +0300
@@ -1,28 +1,28 @@
-/*
-* Copyright (c) 2002-2006 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:  Build information file for project dosservercontrol
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-PRJ_EXPORTS
-#ifndef RD_STARTUP_CHANGE
-../inc/mtfdosservercontrol.h OS_LAYER_PLATFORM_EXPORT_PATH(mtfdosservercontrol.h)
-#endif // RD_STARTUP_CHANGE
-PRJ_MMPFILES
-#ifndef RD_STARTUP_CHANGE
-dosservercontrol.mmp
+/*
+* Copyright (c) 2002-2006 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:  Build information file for project dosservercontrol
+*
+*/
+
+
+#include <platform_paths.hrh>
+
+PRJ_EXPORTS
+#ifndef RD_STARTUP_CHANGE
+../inc/mtfdosservercontrol.h OS_LAYER_PLATFORM_EXPORT_PATH(mtfdosservercontrol.h)
+#endif // RD_STARTUP_CHANGE
+PRJ_MMPFILES
+#ifndef RD_STARTUP_CHANGE
+dosservercontrol.mmp
 #endif // RD_STARTUP_CHANGE
\ No newline at end of file

--- a/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dosservercontrol/group/dosservercontrol.mmp	Fri Jun 11 14:56:08 2010 +0300
+++ b/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dosservercontrol/group/dosservercontrol.mmp	Thu Jul 01 11:20:10 2010 +0300
@@ -1,64 +1,64 @@
-/*
-* Copyright (c)  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:  Declaration of dosservercontrol module
-*
-*/
-
-
-#include <data_caging_paths.hrh>
-#include <platform_paths.hrh>
-
-TARGET          dosservercontrol.dll
-TARGETTYPE      dll
-TARGETPATH      ECOM_RESOURCE_DIR
-
-UID             0x10009D8D 0x10200C6F
-
-CAPABILITY      CAP_GENERAL_DLL
-
-SOURCEPATH      ../src
-SOURCE          tfdosservercontrol.cpp
-SOURCE          tfdosservercontroltestcase.cpp
-SOURCE          tfdosserverproxy.cpp
-SOURCE          tfdosserverplugin.cpp
-SOURCE          tfdoseventlistener.cpp
-
-USERINCLUDE     ../inc
-USERINCLUDE     ../../dsytfcore/inc
-
-// System include macro
-OS_LAYER_SYSTEMINCLUDE
-
-START RESOURCE	../data/10200c6f.rss
-
-HEADER
-TARGETPATH ECOM_RESOURCE_DIR
-
-target dosservercontrol.rsc
-
-END
-
-LIBRARY         euser.lib
-LIBRARY         ecom.lib
-LIBRARY         dsytfcore.lib
-LIBRARY         dsclient.lib
-LIBRARY         bluetooth.lib
-
-//MACRO           COMPONENT_TRACE_FLAG
-MACRO           TEST_CASE_TRACE_FLAG
-
-// Disable if running tests without UI (eg. running tests from console)
-//MACRO		TESTS_NO_UI
-
-SMPSAFE
+/*
+* Copyright (c)  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:  Declaration of dosservercontrol module
+*
+*/
+
+
+#include <data_caging_paths.hrh>
+#include <platform_paths.hrh>
+
+TARGET          dosservercontrol.dll
+TARGETTYPE      dll
+TARGETPATH      ECOM_RESOURCE_DIR
+
+UID             0x10009D8D 0x10200C6F
+
+CAPABILITY      CAP_GENERAL_DLL
+
+SOURCEPATH      ../src
+SOURCE          tfdosservercontrol.cpp
+SOURCE          tfdosservercontroltestcase.cpp
+SOURCE          tfdosserverproxy.cpp
+SOURCE          tfdosserverplugin.cpp
+SOURCE          tfdoseventlistener.cpp
+
+USERINCLUDE     ../inc
+USERINCLUDE     ../../dsytfcore/inc
+
+// System include macro
+OS_LAYER_SYSTEMINCLUDE
+
+START RESOURCE	../data/10200c6f.rss
+
+HEADER
+TARGETPATH ECOM_RESOURCE_DIR
+
+target dosservercontrol.rsc
+
+END
+
+LIBRARY         euser.lib
+LIBRARY         ecom.lib
+LIBRARY         dsytfcore.lib
+LIBRARY         dsclient.lib
+LIBRARY         bluetooth.lib
+
+//MACRO           COMPONENT_TRACE_FLAG
+MACRO           TEST_CASE_TRACE_FLAG
+
+// Disable if running tests without UI (eg. running tests from console)
+//MACRO		TESTS_NO_UI
+
+SMPSAFE

--- a/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dosservercontrol/inc/ctfdoseventlistener.h	Fri Jun 11 14:56:08 2010 +0300
+++ b/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dosservercontrol/inc/ctfdoseventlistener.h	Thu Jul 01 11:20:10 2010 +0300
@@ -1,257 +1,257 @@
-/*
-* Copyright (c) 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:  Declaration of CTFDosServerEventListener class
-*
-*/
-
-
-#ifndef __CTFDOSEVENTLISTENER_H__
-#define __CTFDOSEVENTLISTENER_H__
-
-#include <dossvrservices.h>
-
-class CTFDosServerControl;
-
-NONSHARABLE_CLASS( CTFDosServerEventListener ): public CDosEventListenerBase
-    {
-    public:
-        /**
-        * Constructor
-        */
-        CTFDosServerEventListener( RDosServer& aServer );
-
-        /**
-        * Destructor
-        */
-        virtual ~CTFDosServerEventListener( void );
-
-    private:
-        /**
-        * Copy constructor is hidden
-        */
-        CTFDosServerEventListener( const CTFDosServerEventListener& aListener );
-
-        /**
-        * Assignment operator is hidden
-        */
-        CTFDosServerEventListener& operator=( const CTFDosServerEventListener& aListener );
-
-    protected:
-    
-#ifndef RD_STARTUP_CHANGE  
-        /**
-        * It notifies that a Dos SelfTest has completed.
-        * @param aSelftTestResult The result of the self test.
-        */
-        void NotifySelfTestStatusL( const TInt aSelfTestResult );
-
-        /**
-        * It notifies that the phone side has initiated a shutdown.
-        */
-        void DoMtcInitiatedShutdownL();
-
-        /**
-        * It notifies that the phone is on.
-        */
-        void PhonePowerOnL();
-#endif // RD_STARTUP_CHANGE
-
-#ifndef RD_STARTUP_CHANGE
-        /**
-        * It notifies that the SIM card is ready to be fully used.
-        * @param aStatus The new status.
-        */
-		void SimReadyL( EPSSimReadyStatus aStatus );
-
-        /**
-        * It notifies if the SIM card has been changed.
-        * @param aValue ETrue if it has been or EFalse otherwise.
-        */
-        void SimChangedL( TBool aValue );
-
-        /**
-        * It notifies about a change in the status of the SimLock.
-        * @param aStatus The new status.
-        */
-		void SimLockStatusL(EPSSimLockStatus aStatus);
-        /**
-        * It notifies about a change in the state of the SIM card.
-        * @param aStatus The new state.
-        */
-        void SimStateL( TDosSimState aState );
-
-        /**
-        * It notifies about a change in the status of the calls forwarding settings.
-        * @param aStatus The new status.
-        */
-		void CallsForwardingStatusL(EPSCallsForwardingStatus aStatus);
-        /**
-        * It notifies about a change in the status of the voice mail settings.
-        * @param aStatus The new status.
-        */
-		void VoiceMailStatusL(EPSVoiceMailStatus aStatus);
-
-        /**
-        * It notifies about the existance of a fax message in our voice mail.
-        * @param aValue ETrue or EFalse
-        */
-        void FaxMessageL( TBool aValue );
-
-        /**
-        * It notifies about the existance of a E-mail message in our voice mail.
-        * @param aValue ETrue or EFalse
-        */
-        void EmailMessageL( TBool aValue );
-#endif //RD_STARTUP_CHANGE
-
-        /**
-        * It notifies about a change in the network bars.
-        * @param aValue The new value.
-        */
-    //    void NetworkBarsL( TInt aValue );
-
-#ifndef RD_STARTUP_CHANGE
-        /**
-        * It notifies about a change in the status of the security code.
-        * @param aStatus The new status.
-        */
-		void SecurityCodeL(EPSSecurityCodeStatus aStatus);
-#endif //RD_STARTUP_CHANGE
-
-#ifndef RD_STARTUP_CHANGE
-        /**
-        * It notifies about a change in the status of the current SIM.
-        * @param aStatus The new status.
-        */
-        void CurrentSimOwnedStatusL(EPSCurrentSimOwnedSimStatus aStatus);
-#endif //RD_STARTUP_CHANGE
-
-#ifndef __ACCESSORY_FW
-        /**
-        * It notifies about a headset button state change
-        * @param aMode
-        */
-		void HeadsetButtonChangedL(EPSButtonState aState);
-
-        /**
-        * It notifies about a output volume level changes
-        * @param aState
-        */
-        void OutputVolumeLevelChangedL( TInt aLevel );
-
-        /**
-        * It requests to open a BT Audio link between phone and BT Audio Accessory.    
-        */
-        void AudioLinkOpenReq();
-
-        /**
-        * It requests to close the BT Audio link between phone and BTAA.
-        * @param aConnectionHandle Handle to the audio connection.
-        */    
-        void AudioLinkCloseReq( THCIConnHandle aConnectionHandle );
-
-        /**
-        * It requests to activate voice recognition.    
-        */    
-        void ActivateVoiceRecognitionReq();
-
-        /**
-        * It requests to abort voice recognition.    
-        */    
-        void AbortVoiceRecognitionReq();
-
-        /**
-        * It requests status of voice recognition.    
-        */    
-        void VoiceRecognitionStatusReq();
-
-        /**
-        * It requests to query speed dial number.
-        * @param aIndex A speed dial index.
-        */    
-        void QuerySpeedDialNumberReq( TInt aIndex );
-
-        /**
-        * It requests to query last dialled number.
-        */    
-        void QueryLastDialledVoiceNumberReq();
-
-        /**
-        * It notifies about a change in audio accessory mode.
-        * @param aAccMode The new accessorymode.
-        */    
-        void AccessoryModeChangedInd( TBTAccessoryMode aAccMode );
-
-        /**
-        * It notifies about a change in BT audio accessory mode.    
-        * @param aDeviceType BT Accessory device's type.
-        */
-        void BTAccessoryModeChangedInd( TBTDeviceType aDeviceType );
-
-        /**
-        * It notifies about a change in audio accessory's speaker volume level.
-        * @param aVolume The new volume level.
-        */    
-        void AccessorySpeakerVolumeSetInd( TUint aVolume );
-
-        /**
-        * It notifies about a change in BT connection status.
-        * @param aServiceLevelConnParams A struct containing parameters.    
-        */
-        void ServiceLevelConnEstablishedInd( TBTServiceLevelConnParams aServiceLevelConnParams );    
-#endif //__ACCESSORY_FW
-        
-#ifndef RD_STARTUP_CHANGE
-        /**
-        * It notifies about a change sms storage status.
-        * @param aServiceLevelConnParams A struct containing parameters.    
-        */
-        void SmsStorageStatusChangedL( TDosSmsStorageStatus aStatus );    
-#endif // RD_STARTUP_CHANGE
-
-        /**
-        * This a raw event that is intended for expansion of the event functionality by licensees.
-        * @param aEvent The event.
-        * @param aParameter A pointer to the parameter.
-        */
-        void GeneralEventL( const TRegisterEvent& aEvent,TAny* aParameter );
-
-#ifndef __ACCESSORY_FW
-        /**
-        * It notifies about a change in the status of the handsfree mode.
-        * @param aStatus The new status.
-        */
-        void HandsfreeModeChanged(EPSHandsFreeMode aMode);
-
-        /**
-        * Notifies of changes in accessory mode
-        * @param aMode New accessory mode
-        */
-        void AccessoryModeChangedL( TDosAccessoryMode aMode );
-#endif //__ACCESSORY_FW
-
-#ifndef RD_STARTUP_CHANGE
-        /**
-        * Notifies if SIM is present or not
-        * @param aMode SIM present state
-        */
-        void SimPresentStateChangedL( TDosSimPresentState aState );
-#endif //RD_STARTUP_CHANGE
-
-    };
-
-
-#endif
-
-// End of file
+/*
+* Copyright (c) 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:  Declaration of CTFDosServerEventListener class
+*
+*/
+
+
+#ifndef __CTFDOSEVENTLISTENER_H__
+#define __CTFDOSEVENTLISTENER_H__
+
+#include <dossvrservices.h>
+
+class CTFDosServerControl;
+
+NONSHARABLE_CLASS( CTFDosServerEventListener ): public CDosEventListenerBase
+    {
+    public:
+        /**
+        * Constructor
+        */
+        CTFDosServerEventListener( RDosServer& aServer );
+
+        /**
+        * Destructor
+        */
+        virtual ~CTFDosServerEventListener( void );
+
+    private:
+        /**
+        * Copy constructor is hidden
+        */
+        CTFDosServerEventListener( const CTFDosServerEventListener& aListener );
+
+        /**
+        * Assignment operator is hidden
+        */
+        CTFDosServerEventListener& operator=( const CTFDosServerEventListener& aListener );
+
+    protected:
+    
+#ifndef RD_STARTUP_CHANGE  
+        /**
+        * It notifies that a Dos SelfTest has completed.
+        * @param aSelftTestResult The result of the self test.
+        */
+        void NotifySelfTestStatusL( const TInt aSelfTestResult );
+
+        /**
+        * It notifies that the phone side has initiated a shutdown.
+        */
+        void DoMtcInitiatedShutdownL();
+
+        /**
+        * It notifies that the phone is on.
+        */
+        void PhonePowerOnL();
+#endif // RD_STARTUP_CHANGE
+
+#ifndef RD_STARTUP_CHANGE
+        /**
+        * It notifies that the SIM card is ready to be fully used.
+        * @param aStatus The new status.
+        */
+		void SimReadyL( EPSSimReadyStatus aStatus );
+
+        /**
+        * It notifies if the SIM card has been changed.
+        * @param aValue ETrue if it has been or EFalse otherwise.
+        */
+        void SimChangedL( TBool aValue );
+
+        /**
+        * It notifies about a change in the status of the SimLock.
+        * @param aStatus The new status.
+        */
+		void SimLockStatusL(EPSSimLockStatus aStatus);
+        /**
+        * It notifies about a change in the state of the SIM card.
+        * @param aStatus The new state.
+        */
+        void SimStateL( TDosSimState aState );
+
+        /**
+        * It notifies about a change in the status of the calls forwarding settings.
+        * @param aStatus The new status.
+        */
+		void CallsForwardingStatusL(EPSCallsForwardingStatus aStatus);
+        /**
+        * It notifies about a change in the status of the voice mail settings.
+        * @param aStatus The new status.
+        */
+		void VoiceMailStatusL(EPSVoiceMailStatus aStatus);
+
+        /**
+        * It notifies about the existance of a fax message in our voice mail.
+        * @param aValue ETrue or EFalse
+        */
+        void FaxMessageL( TBool aValue );
+
+        /**
+        * It notifies about the existance of a E-mail message in our voice mail.
+        * @param aValue ETrue or EFalse
+        */
+        void EmailMessageL( TBool aValue );
+#endif //RD_STARTUP_CHANGE
+
+        /**
+        * It notifies about a change in the network bars.
+        * @param aValue The new value.
+        */
+    //    void NetworkBarsL( TInt aValue );
+
+#ifndef RD_STARTUP_CHANGE
+        /**
+        * It notifies about a change in the status of the security code.
+        * @param aStatus The new status.
+        */
+		void SecurityCodeL(EPSSecurityCodeStatus aStatus);
+#endif //RD_STARTUP_CHANGE
+
+#ifndef RD_STARTUP_CHANGE
+        /**
+        * It notifies about a change in the status of the current SIM.
+        * @param aStatus The new status.
+        */
+        void CurrentSimOwnedStatusL(EPSCurrentSimOwnedSimStatus aStatus);
+#endif //RD_STARTUP_CHANGE
+
+#ifndef __ACCESSORY_FW
+        /**
+        * It notifies about a headset button state change
+        * @param aMode
+        */
+		void HeadsetButtonChangedL(EPSButtonState aState);
+
+        /**
+        * It notifies about a output volume level changes
+        * @param aState
+        */
+        void OutputVolumeLevelChangedL( TInt aLevel );
+
+        /**
+        * It requests to open a BT Audio link between phone and BT Audio Accessory.    
+        */
+        void AudioLinkOpenReq();
+
+        /**
+        * It requests to close the BT Audio link between phone and BTAA.
+        * @param aConnectionHandle Handle to the audio connection.
+        */    
+        void AudioLinkCloseReq( THCIConnHandle aConnectionHandle );
+
+        /**
+        * It requests to activate voice recognition.    
+        */    
+        void ActivateVoiceRecognitionReq();
+
+        /**
+        * It requests to abort voice recognition.    
+        */    
+        void AbortVoiceRecognitionReq();
+
+        /**
+        * It requests status of voice recognition.    
+        */    
+        void VoiceRecognitionStatusReq();
+
+        /**
+        * It requests to query speed dial number.
+        * @param aIndex A speed dial index.
+        */    
+        void QuerySpeedDialNumberReq( TInt aIndex );
+
+        /**
+        * It requests to query last dialled number.
+        */    
+        void QueryLastDialledVoiceNumberReq();
+
+        /**
+        * It notifies about a change in audio accessory mode.
+        * @param aAccMode The new accessorymode.
+        */    
+        void AccessoryModeChangedInd( TBTAccessoryMode aAccMode );
+
+        /**
+        * It notifies about a change in BT audio accessory mode.    
+        * @param aDeviceType BT Accessory device's type.
+        */
+        void BTAccessoryModeChangedInd( TBTDeviceType aDeviceType );
+
+        /**
+        * It notifies about a change in audio accessory's speaker volume level.
+        * @param aVolume The new volume level.
+        */    
+        void AccessorySpeakerVolumeSetInd( TUint aVolume );
+
+        /**
+        * It notifies about a change in BT connection status.
+        * @param aServiceLevelConnParams A struct containing parameters.    
+        */
+        void ServiceLevelConnEstablishedInd( TBTServiceLevelConnParams aServiceLevelConnParams );    
+#endif //__ACCESSORY_FW
+        
+#ifndef RD_STARTUP_CHANGE
+        /**
+        * It notifies about a change sms storage status.
+        * @param aServiceLevelConnParams A struct containing parameters.    
+        */
+        void SmsStorageStatusChangedL( TDosSmsStorageStatus aStatus );    
+#endif // RD_STARTUP_CHANGE
+
+        /**
+        * This a raw event that is intended for expansion of the event functionality by licensees.
+        * @param aEvent The event.
+        * @param aParameter A pointer to the parameter.
+        */
+        void GeneralEventL( const TRegisterEvent& aEvent,TAny* aParameter );
+
+#ifndef __ACCESSORY_FW
+        /**
+        * It notifies about a change in the status of the handsfree mode.
+        * @param aStatus The new status.
+        */
+        void HandsfreeModeChanged(EPSHandsFreeMode aMode);
+
+        /**
+        * Notifies of changes in accessory mode
+        * @param aMode New accessory mode
+        */
+        void AccessoryModeChangedL( TDosAccessoryMode aMode );
+#endif //__ACCESSORY_FW
+
+#ifndef RD_STARTUP_CHANGE
+        /**
+        * Notifies if SIM is present or not
+        * @param aMode SIM present state
+        */
+        void SimPresentStateChangedL( TDosSimPresentState aState );
+#endif //RD_STARTUP_CHANGE
+
+    };
+
+
+#endif
+
+// End of file

--- a/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dosservercontrol/inc/ctfdosservercontrol.h	Fri Jun 11 14:56:08 2010 +0300
+++ b/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dosservercontrol/inc/ctfdosservercontrol.h	Thu Jul 01 11:20:10 2010 +0300
@@ -1,124 +1,124 @@
-/*
-* Copyright (c) 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:  Declaration of CTFDosServerControl class
-*
-*/
-
-
-#ifndef __CTFDOSSERVERCONTROL_H__
-#define __CTFDOSSERVERCONTROL_H__
-
-#include <dossvrservices.h>
-#include "ctfstub.h"
-#include "mtfdosservercontrol.h"
-#include "tfdosservertypes.h"
-
-struct TTFDosServerControlTestCaseState;
-class CTFDosServerEventListener;
-class RTFDosExtension;
-
-const TInt KTFStubTypeDosServerControl = 560;
-
-NONSHARABLE_CLASS( CTFDosServerControl ): public CTFStub, public MTFDosServerControl
-    {
-    public:
-        /**
-        * Constructor
-        */
-        CTFDosServerControl( void );
-
-        /**
-        * Destructor
-        */
-        virtual ~CTFDosServerControl( void );
-    
-    private:
-        /**
-        * Copy constructor is hidden
-        */
-        CTFDosServerControl( const CTFDosServerControl& aStub );
-
-        /**
-        * Assignment operator is hidden
-        */
-        CTFDosServerControl& operator=( const CTFDosServerControl& aStub );
-    
-    public:
-        /**
-        * Initializes this stub
-        */
-        void InitializeL( void );
-    
-    public:
-        /**
-        * Calls a DosServer function
-        */
-        void CallDosFunctionL( TTFDosServerControlTestCaseState& aParameter );
-
-        /**
-        * Gets the parameter count for given DosServer method
-        */
-        TInt ParameterCount( TTFDosFunction aFunction ) const;
-
-        /**
-        * Gets the parameter bounds of given DosServer method
-        */
-        TBool ParameterBounds( TTFDosFunction aFunction, TInt* aMin, TInt* aMax ) const;
-
-        /**
-        * Notifies about a DosServer event
-        */
-        void NotifyDosEvent( TInt aEvent, TInt aParameter );
-
-        /**
-        * Closes all DosServer services
-        */
-        void ResetDosServices( void );
-    
-    private:
-        RDosServer iDosServer;
-#ifndef __ACCESSORY_FW
-        RDosAudio* iDosAudio;
-        RDosAccessory* iDosAccessory;
-#endif //__ACCESSORY_FW
-#ifndef RD_STARTUP_CHANGE
-        RDosSysUtils* iDosSysUtils;
-        RDosHelper* iDosHelper;
-        RDosMtc* iDosMtc;
-        RDosSelfTest* iDosSelfTest;
-#endif //RD_STARTUP_CHANGE 
-        RDosSae* iDosSae;
-#ifndef __ACCESSORY_FW 
-        RDosBTAudio* iDosBTAudio;
-#endif //__ACCESSORY_FW
-        RTFDosExtension* iDosExtension;
-        CTFDosServerEventListener* iEventListener;
-        TBool iInitialized;
-    };
-
-class RTFDosExtension : public RDosExtension
-    {
-    public:
-        /**
-        * Calls a synchronous RDosExtension::CallFunction
-        */
-        TInt CallSyncDosExtFunction( const TInt& aFunc, TAny* aParam, TInt aParLength, TBool aAutoComplete );
-
-        /**
-        * Calls an asynchronous RDosExtension::CallFunction
-        */
-        TInt CallAsyncDosExtFunction( TRequestStatus& aStatus, TInt aFunc, TAny* aParam, TInt aParLength, TBool aAutoComplete );
-    };
-
-#endif
+/*
+* Copyright (c) 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:  Declaration of CTFDosServerControl class
+*
+*/
+
+
+#ifndef __CTFDOSSERVERCONTROL_H__
+#define __CTFDOSSERVERCONTROL_H__
+
+#include <dossvrservices.h>
+#include "ctfstub.h"
+#include "mtfdosservercontrol.h"
+#include "tfdosservertypes.h"
+
+struct TTFDosServerControlTestCaseState;
+class CTFDosServerEventListener;
+class RTFDosExtension;
+
+const TInt KTFStubTypeDosServerControl = 560;
+
+NONSHARABLE_CLASS( CTFDosServerControl ): public CTFStub, public MTFDosServerControl
+    {
+    public:
+        /**
+        * Constructor
+        */
+        CTFDosServerControl( void );
+
+        /**
+        * Destructor
+        */
+        virtual ~CTFDosServerControl( void );
+    
+    private:
+        /**
+        * Copy constructor is hidden
+        */
+        CTFDosServerControl( const CTFDosServerControl& aStub );
+
+        /**
+        * Assignment operator is hidden
+        */
+        CTFDosServerControl& operator=( const CTFDosServerControl& aStub );
+    
+    public:
+        /**
+        * Initializes this stub
+        */
+        void InitializeL( void );
+    
+    public:
+        /**
+        * Calls a DosServer function
+        */
+        void CallDosFunctionL( TTFDosServerControlTestCaseState& aParameter );
+
+        /**
+        * Gets the parameter count for given DosServer method
+        */
+        TInt ParameterCount( TTFDosFunction aFunction ) const;
+
+        /**
+        * Gets the parameter bounds of given DosServer method
+        */
+        TBool ParameterBounds( TTFDosFunction aFunction, TInt* aMin, TInt* aMax ) const;
+
+        /**
+        * Notifies about a DosServer event
+        */
+        void NotifyDosEvent( TInt aEvent, TInt aParameter );
+
+        /**
+        * Closes all DosServer services
+        */
+        void ResetDosServices( void );
+    
+    private:
+        RDosServer iDosServer;
+#ifndef __ACCESSORY_FW
+        RDosAudio* iDosAudio;
+        RDosAccessory* iDosAccessory;
+#endif //__ACCESSORY_FW
+#ifndef RD_STARTUP_CHANGE
+        RDosSysUtils* iDosSysUtils;
+        RDosHelper* iDosHelper;
+        RDosMtc* iDosMtc;
+        RDosSelfTest* iDosSelfTest;
+#endif //RD_STARTUP_CHANGE 
+        RDosSae* iDosSae;
+#ifndef __ACCESSORY_FW 
+        RDosBTAudio* iDosBTAudio;
+#endif //__ACCESSORY_FW
+        RTFDosExtension* iDosExtension;
+        CTFDosServerEventListener* iEventListener;
+        TBool iInitialized;
+    };
+
+class RTFDosExtension : public RDosExtension
+    {
+    public:
+        /**
+        * Calls a synchronous RDosExtension::CallFunction
+        */
+        TInt CallSyncDosExtFunction( const TInt& aFunc, TAny* aParam, TInt aParLength, TBool aAutoComplete );
+
+        /**
+        * Calls an asynchronous RDosExtension::CallFunction
+        */
+        TInt CallAsyncDosExtFunction( TRequestStatus& aStatus, TInt aFunc, TAny* aParam, TInt aParLength, TBool aAutoComplete );
+    };
+
+#endif

--- a/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dosservercontrol/inc/ctfdosservercontroltestcase.h	Fri Jun 11 14:56:08 2010 +0300
+++ b/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dosservercontrol/inc/ctfdosservercontroltestcase.h	Thu Jul 01 11:20:10 2010 +0300
@@ -1,165 +1,165 @@
-/*
-* Copyright (c) 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:  Declaration of CTFDosServerControlTestCase class
-*
-*/
-
-
-#ifndef __CTFDOSSERVERCONTROLTESTCASE_H__
-#define __CTFDOSSERVERCONTROLTESTCASE_H__
-
-#include <mtfaactivetest.h>
-#include "ctfstubtestcase.h"
-#include "tfdosservertypes.h"
-
-class CTFATestTimer;
-class CTFDosServerControlTestCaseParam;
-
-/**
-* Test case declaration macro
-*/
-#define TF_DOS_SERVER_CONTROL_TEST_CASE_L( aCaseId, aCaseStates ) \
-    case aCaseId: \
-        { \
-        CTFDosServerControlTestCaseParam* param = new ( ELeave ) CTFDosServerControlTestCaseParam(); \
-        CleanupStack::PushL( param ); \
-        param->ConstructL( aCaseStates, sizeof ( aCaseStates ) / sizeof ( TTFDosServerControlTestCaseState ) ); \
-        returnValue = new ( ELeave ) CTFDosServerControlTestCase( param ); \
-        CleanupStack::Pop(); \
-        CleanupStack::PushL( returnValue ); \
-        STATIC_CAST( CTFDosServerControlTestCase*, returnValue )->ConstructL(); \
-        CleanupStack::Pop(); \
-        } \
-        break
-
-NONSHARABLE_CLASS( CTFDosServerControlTestCase ): public CTFStubTestCase, public MTFAActiveTest
-    {
-    public:
-        /**
-        * Constructor
-        */
-        CTFDosServerControlTestCase( CTFDosServerControlTestCaseParam* aParameters );
-
-        /**
-        * 2nd phase constructor
-        */
-        void ConstructL( void );
-
-        /**
-        * Destructor
-        */
-        ~CTFDosServerControlTestCase( void );
-    
-    private:
-        /**
-        * Copy constructor is hidden
-        */
-        CTFDosServerControlTestCase( const CTFDosServerControlTestCase& aStub );
-
-        /**
-        * Assignment operator is hidden
-        */
-        CTFDosServerControlTestCase& operator=( const CTFDosServerControlTestCase& aStub );
-    
-    public:
-        /**
-        * Notifies about a DosServer event
-        */
-        void NotifyDosEvent( TInt aEvent, TInt aParameter );
-
-    public:
-        /**
-        * Timer callback to cancel test if it takes too long
-        */
-        void ActiveTestRunL( void );
-
-    protected:
-        /**
-        * Logs this test case
-        */
-        void Log( TInt aDepth );
-
-        /**
-        * Initializes this test case
-        */
-        void InitL( void );
-
-        /**
-        * Runs this test case
-        */
-        void RunL( void );
-
-        /**
-        * Releases this test case
-        */
-        void Teardown( void );
-
-    protected:
-        /**
-        * Completes this test case with given result
-        */
-        void DoCompleteTest( TInt aResult );
-
-        /**
-        * Starts the next test case state
-        */
-        void StartNextState( TInt aResult );
-
-        /**
-        * Calls the DosServer function of the current test case state
-        */
-        void CallCurrentDosFunctionL( void );
-
-        /**
-        * Gets the index of current state
-        */
-        TInt CurrentStateIndex( void ) const;
-
-        /**
-        * Gets the test case parameters
-        */
-        CTFDosServerControlTestCaseParam& Parameters( void );
-
-        /**
-        * Gets the current DosServer function
-        */
-        TTFDosFunction CurrentDosFunction( void ) const;
-
-        /**
-        * Gets the current argument 1
-        */
-        TInt CurrentArg1( void ) const;
-
-        /**
-        * Gets the timer
-        */
-        CTFATestTimer* Timer( void );
-
-    private:
-        /**
-        * Checks a test result
-        */
-        TInt CheckResult( TInt aResult, TBool aIsEvent );
-    
-    private:
-        CTFDosServerControlTestCaseParam* iParameters;
-        TTFDosServerControlTestCaseState iCurrentState;
-        TInt iCurrentStateIndex;
-        CTFATestTimer* iTimer;
-        TBool iCleanupWait;
-        TInt iStoredArg1;
-        TInt iStoredArg2;
-    };
-
-#endif
+/*
+* Copyright (c) 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:  Declaration of CTFDosServerControlTestCase class
+*
+*/
+
+
+#ifndef __CTFDOSSERVERCONTROLTESTCASE_H__
+#define __CTFDOSSERVERCONTROLTESTCASE_H__
+
+#include <mtfaactivetest.h>
+#include "ctfstubtestcase.h"
+#include "tfdosservertypes.h"
+
+class CTFATestTimer;
+class CTFDosServerControlTestCaseParam;
+
+/**
+* Test case declaration macro
+*/
+#define TF_DOS_SERVER_CONTROL_TEST_CASE_L( aCaseId, aCaseStates ) \
+    case aCaseId: \
+        { \
+        CTFDosServerControlTestCaseParam* param = new ( ELeave ) CTFDosServerControlTestCaseParam(); \
+        CleanupStack::PushL( param ); \
+        param->ConstructL( aCaseStates, sizeof ( aCaseStates ) / sizeof ( TTFDosServerControlTestCaseState ) ); \
+        returnValue = new ( ELeave ) CTFDosServerControlTestCase( param ); \
+        CleanupStack::Pop(); \
+        CleanupStack::PushL( returnValue ); \
+        STATIC_CAST( CTFDosServerControlTestCase*, returnValue )->ConstructL(); \
+        CleanupStack::Pop(); \
+        } \
+        break
+
+NONSHARABLE_CLASS( CTFDosServerControlTestCase ): public CTFStubTestCase, public MTFAActiveTest
+    {
+    public:
+        /**
+        * Constructor
+        */
+        CTFDosServerControlTestCase( CTFDosServerControlTestCaseParam* aParameters );
+
+        /**
+        * 2nd phase constructor
+        */
+        void ConstructL( void );
+
+        /**
+        * Destructor
+        */
+        ~CTFDosServerControlTestCase( void );
+    
+    private:
+        /**
+        * Copy constructor is hidden
+        */
+        CTFDosServerControlTestCase( const CTFDosServerControlTestCase& aStub );
+
+        /**
+        * Assignment operator is hidden
+        */
+        CTFDosServerControlTestCase& operator=( const CTFDosServerControlTestCase& aStub );
+    
+    public:
+        /**
+        * Notifies about a DosServer event
+        */
+        void NotifyDosEvent( TInt aEvent, TInt aParameter );
+
+    public:
+        /**
+        * Timer callback to cancel test if it takes too long
+        */
+        void ActiveTestRunL( void );
+
+    protected:
+        /**
+        * Logs this test case
+        */
+        void Log( TInt aDepth );
+
+        /**
+        * Initializes this test case
+        */
+        void InitL( void );
+
+        /**
+        * Runs this test case
+        */
+        void RunL( void );
+
+        /**
+        * Releases this test case
+        */
+        void Teardown( void );
+
+    protected:
+        /**
+        * Completes this test case with given result
+        */
+        void DoCompleteTest( TInt aResult );
+
+        /**
+        * Starts the next test case state
+        */
+        void StartNextState( TInt aResult );
+
+        /**
+        * Calls the DosServer function of the current test case state
+        */
+        void CallCurrentDosFunctionL( void );
+
+        /**
+        * Gets the index of current state
+        */
+        TInt CurrentStateIndex( void ) const;
+
+        /**
+        * Gets the test case parameters
+        */
+        CTFDosServerControlTestCaseParam& Parameters( void );
+
+        /**
+        * Gets the current DosServer function
+        */
+        TTFDosFunction CurrentDosFunction( void ) const;
+
+        /**
+        * Gets the current argument 1
+        */
+        TInt CurrentArg1( void ) const;
+
+        /**
+        * Gets the timer
+        */
+        CTFATestTimer* Timer( void );
+
+    private:
+        /**
+        * Checks a test result
+        */
+        TInt CheckResult( TInt aResult, TBool aIsEvent );
+    
+    private:
+        CTFDosServerControlTestCaseParam* iParameters;
+        TTFDosServerControlTestCaseState iCurrentState;
+        TInt iCurrentStateIndex;
+        CTFATestTimer* iTimer;
+        TBool iCleanupWait;
+        TInt iStoredArg1;
+        TInt iStoredArg2;
+    };
+
+#endif

--- a/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dosservercontrol/inc/ctfdosservercontroltestcaseparam.h	Fri Jun 11 14:56:08 2010 +0300
+++ b/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dosservercontrol/inc/ctfdosservercontroltestcaseparam.h	Thu Jul 01 11:20:10 2010 +0300
@@ -1,71 +1,71 @@
-/*
-* Copyright (c) 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:  Declaration of CTFDosServerControlTestCaseParam class
-*
-*/
-
-
-#ifndef __CTFDOSSERVERCONTROLTESTCASEPARAM_H__
-#define __CTFDOSSERVERCONTROLTESTCASEPARAM_H__
-
-#include <e32base.h>
-#include "ctfstubtestcaseparam.h"
-#include "tfdosservertypes.h"
-
-NONSHARABLE_CLASS( CTFDosServerControlTestCaseParam ): public CTFStubTestCaseParam
-    {
-    public:
-        /**
-        * Constructor
-        */
-        CTFDosServerControlTestCaseParam( void );
-
-        /**
-        * 2nd phase constructor
-        */
-        void ConstructL( const TTFDosServerControlTestCaseState* aStates, TInt aStateCount );
-
-        /**
-        * Destructor
-        */
-        virtual ~CTFDosServerControlTestCaseParam( void );
-    
-    private:
-        /**
-        * Copy constructor is hidden
-        */
-        CTFDosServerControlTestCaseParam( const CTFDosServerControlTestCaseParam& aParam );
-
-        /**
-        * Assignment operator is hidden
-        */
-        CTFDosServerControlTestCaseParam& operator=( const CTFDosServerControlTestCaseParam& aParam );
-    
-    public:
-        /**
-        * Gets the test case states
-        */
-        const TTFDosServerControlTestCaseState* States( void ) const;
-
-        /**
-        * Gets the state count
-        */
-        TInt StateCount( void ) const;
-
-    private:
-        TTFDosServerControlTestCaseState* iStates;
-        TInt iStateCount;
-    };
-
-#endif
+/*
+* Copyright (c) 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:  Declaration of CTFDosServerControlTestCaseParam class
+*
+*/
+
+
+#ifndef __CTFDOSSERVERCONTROLTESTCASEPARAM_H__
+#define __CTFDOSSERVERCONTROLTESTCASEPARAM_H__
+
+#include <e32base.h>
+#include "ctfstubtestcaseparam.h"
+#include "tfdosservertypes.h"
+
+NONSHARABLE_CLASS( CTFDosServerControlTestCaseParam ): public CTFStubTestCaseParam
+    {
+    public:
+        /**
+        * Constructor
+        */
+        CTFDosServerControlTestCaseParam( void );
+
+        /**
+        * 2nd phase constructor
+        */
+        void ConstructL( const TTFDosServerControlTestCaseState* aStates, TInt aStateCount );
+
+        /**
+        * Destructor
+        */
+        virtual ~CTFDosServerControlTestCaseParam( void );
+    
+    private:
+        /**
+        * Copy constructor is hidden
+        */
+        CTFDosServerControlTestCaseParam( const CTFDosServerControlTestCaseParam& aParam );
+
+        /**
+        * Assignment operator is hidden
+        */
+        CTFDosServerControlTestCaseParam& operator=( const CTFDosServerControlTestCaseParam& aParam );
+    
+    public:
+        /**
+        * Gets the test case states
+        */
+        const TTFDosServerControlTestCaseState* States( void ) const;
+
+        /**
+        * Gets the state count
+        */
+        TInt StateCount( void ) const;
+
+    private:
+        TTFDosServerControlTestCaseState* iStates;
+        TInt iStateCount;
+    };
+
+#endif

--- a/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dosservercontrol/inc/ctfdosserverplugin.h	Fri Jun 11 14:56:08 2010 +0300
+++ b/accessoryservices/accessoryremotecontrol/tsrc/remcontestcontrol/dosservercontrol/inc/ctfdosserverplugin.h	Thu Jul 01 11:20:10 2010 +0300
@@ -1,75 +1,75 @@
-/*
-* Copyright (c) 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:  Declaration of CTFDosServerPlugin class
-*
-*/
-
-
-#ifndef __CTFDOSSERVERPLUGIN_H__
-#define __CTFDOSSERVERPLUGIN_H__
-
-// INCLUDE FILES
-#include "ctfstubmoduleinterface.h"
-
-// CLASS DECLARATION
-
-/**
-*  An implementation of CTFStubModuleInterface.
-*/
-NONSHARABLE_CLASS( CTFDosServerPlugin ) : public CTFStubModuleInterface
-    {
-    public:        // Constructors and destructor
-        /**
-        * Two-phased constructor.
-        * @param aInitParams Initialisation parameters.
-        * @return The created object.
-        */
-        static CTFDosServerPlugin* NewL( TAny* aInitParams );
-
-        /**
-        * Destructor.
-        */
-        ~CTFDosServerPlugin( void );
-
-    public:        // Functions from base classes
-        /**
-        * Gets the stub implementation of this plug-in module
-        */
-        CTFStub* GetStubL( void );
-
-        /**
-        * Builds the test suite of this plug-in module.
-        */
-        void BuildTestSuiteL( CTFATestSuite* aRootSuite );
-
-        /**
-        * Gets the plug-in module specific part of a test case which has the given test case ID
-        */
-        MTFStubTestCase* GetStubTestCaseL( TInt aTestCaseId );
-
-    private:    // Functions
-        /**
-        * C++ default constructor.
-        * @param aParams Initialisation parameters.
-        */
-        CTFDosServerPlugin( TAny* aParams );
-
-    private:    // Data
-        CTFStubModuleInterface::TInterfaceInitParams* iInitParams;
-
-    };  
-
-#endif    //__CTFDOSSERVERPLUGIN_H__
-
-// End of File
+/*
+* Copyright (c) 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:  Declaration of CTFDosServerPlugin class
+*
+*/
+
+
+#ifndef __CTFDOSSERVERPLUGIN_H__
+#define __CTFDOSSERVERPLUGIN_H__
+
+// INCLUDE FILES
+#include "ctfstubmoduleinterface.h"
+
+// CLASS DECLARATION
+
+/**
+*  An implementation of CTFStubModuleInterface.
+*/
+NONSHARABLE_CLASS( CTFDosServerPlugin ) : public CTFStubModuleInterface
+    {
+    public:        // Constructors and destructor
+        /**
+        * Two-phased constructor.
+        * @param aInitParams Initialisation parameters.
+        * @return The created object.
+        */
+        static CTFDosServerPlugin* NewL( TAny* aInitParams );
+
+        /**
+        * Destructor.
+        */
+        ~CTFDosServerPlugin( void );
+
+    public:        // Functions from base classes
+        /**
+        * Gets the stub implementation of this plug-in module
+        */
+        CTFStub* GetStubL( void );
+
+        /**
+        * Builds the test suite of this plug-in module.
+        */
+        void BuildTestSuiteL( CTFATestSuite* aRootSuite );
+
+        /**
+        * Gets the plug-in module specific part of a test case which has the given test case ID
+        */
+        MTFStubTestCase* GetStubTestCaseL( TInt aTestCaseId );
+
+    private:    // Functions
+        /**
+        * C++ default constructor.
+        * @param aParams Initialisation parameters.
+        */
+        CTFDosServerPlugin( TAny* aParams );
+
+    private:    // Data
+        CTFStubModuleInterface::TInterfaceInitParams* iInitParams;
+
+    };  
+
+#endif    //__CTFDOSSERVERPLUGIN_H__
+
+// End of File