diff -r 6b1d113cdff3 -r 6638e7f4bd8f telephonyserverplugins/multimodetsy/test/Te_LoopBack/Te_LoopBackcnocmgf.h
--- a/telephonyserverplugins/multimodetsy/test/Te_LoopBack/Te_LoopBackcnocmgf.h	Mon May 03 13:37:20 2010 +0300
+++ b/telephonyserverplugins/multimodetsy/test/Te_LoopBack/Te_LoopBackcnocmgf.h	Thu May 06 15:10:38 2010 +0100
@@ -1,187 +1,187 @@
-// Copyright (c) 1997-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:
-//
-
-/**
- @file
- @internalComponent 
-*/
-
-
-#ifndef __CNOCMGF_H__
-#define __CNOCMGF_H__
-
-#include "Te_LoopbackTestStepBase.h"
-#include "Te_LoopBackScriptEng.h"
-
-//
-// First a Script where everything is in order
-//
-const struct TScript KNoCMGFScript[]= {
-	{	ERxString,	(TText8*)"AT\r",		0, ERxEvent	},
-	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
-
-	{	EIfRxStringJmp, (TText8*)"AT\r",	1, 0	},
-
-	{	ERxString, (TText8*)"AT+FCLASS=?",	0, ERxEvent	},
-	{	ETxString, (TText8*)"0,1,2\r",		0, ETxEvent|EFailIfTimeOut	},
-	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
-
-//
-// The initialisation string - we don't care what it is
-//
-	{	ERxString, (TText8*)"AT",			0, ERxEvent	},
-	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
-
-	{	ERxString, (TText8*)"AT+CNMI=,0",   0, ERxEvent	},
-	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
-
-	{	ERxString, (TText8*)"ATS7?",		0, ERxEvent	},
-	{	ETxString, (TText8*)"050\r",		0, ETxEvent|EFailIfTimeOut	},
-	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
-
-	{	ERxString, (TText8*)"ATS0=0",		0, ERxEvent	},
-	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
-
-	{	ERxString, (TText8*)"AT+CGMI",	0, ERxEvent	},
-	{	ETxString, (TText8*)"ERICSSON\r",	0, ETxEvent|EFailIfTimeOut	},
-	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
-
-	{	ERxString, (TText8*)"AT+CGMM",	0, ERxEvent	},
-	{	ETxString, (TText8*)"1100801\r",	0, ETxEvent|EFailIfTimeOut	},
-	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
-
-	{	ERxString, (TText8*)"AT+CGMR",	0, ERxEvent	},
-	{	ETxString, (TText8*)"9808261341\r",	0, ETxEvent|EFailIfTimeOut	},
-	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
-
-	{	ERxString, (TText8*)"AT+CGSN",	0, ERxEvent	},
-	{	ETxString, (TText8*)"520002512954000\r",	0, ETxEvent|EFailIfTimeOut	},
-	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
-
-	{	ERxString, (TText8*)"AT+CIMI",	0, ERxEvent	},
-	{	ETxString, (TText8*)"ERROR\r",	0, ETxEvent|EFailIfTimeOut	},
-
-// PDU mode not supported - return error to AT+CMGF command 
-	{	ERxString, (TText8*)"AT+CMGF=?",	0, ERxEvent	},
-	{	ETxString, (TText8*)"ERROR\r",	    0, ETxEvent|EFailIfTimeOut	},
-
-	{	ERxString, (TText8*)"AT",	        0, ERxEvent	},
-	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
-
-	{	ERxString, (TText8*)"AT+CPMS=?",	0, ERxEvent	},
-	{	ETxString, (TText8*)"+CPMS: (\"ME\",\"SM\"),(\"ME\",\"SM\")\r",	0, ETxEvent|EFailIfTimeOut	},
-	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
-
-	{	ERxString, (TText8*)"AT+CPMS?",	0, ERxEvent	},
-	{	ETxString, (TText8*)"+CPMS: \"SM\",0,15,\"SM\",0,15\r",	0, ETxEvent|EFailIfTimeOut	},
-	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
-
-	{	ERxString, (TText8*)"AT+CPBS=?",	0, ERxEvent	},
-	{	ETxString, (TText8*)"+CPBS: (\"ME\",\"SM\")\r",	0, ETxEvent|EFailIfTimeOut	},
-	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
-
-	{	ERxString, (TText8*)"AT+CREG=0",	0, ERxEvent	},
-	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
-
-	{	ERxString, (TText8*)"AT+CREG=2",	0, ERxEvent	},
-	{	ETxString, (TText8*)"ERROR\r",		0, ETxEvent|EFailIfTimeOut	},
-
-	{	ERxString, (TText8*)"AT+CREG=1",	0, ERxEvent	},
-	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
-
-	{	ERxString, (TText8*)"AT+CREG?",	0, ERxEvent	},
-	{	ETxString, (TText8*)"ERROR\r",	0, ETxEvent|EFailIfTimeOut	},
-	
-	{	ERxString, (TText8*)"AT+CRC=1",		0, ERxEvent	},
-	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
-
-	{	ERxString, (TText8*)"AT+COPS?",	0, ERxEvent	},
-	{	ETxString, (TText8*)"+COPS: 0,0,\"UK VODAFONE\"\r",	0, ETxEvent|EFailIfTimeOut	},
-	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
-
-	{	ERxString, (TText8*)"AT+CBC",	0, ERxEvent	},
-	{	ETxString, (TText8*)"ERROR\r",		0, ETxEvent|EFailIfTimeOut	},
-
-	{	ERxString, (TText8*)"AT+CSQ",	0, ERxEvent	},
-	{	ETxString, (TText8*)"ERROR\r",		0, ETxEvent|EFailIfTimeOut	},
-
-	{	ERxString, (TText8*)"AT+CGCLASS",	0, ERxEvent	},
-	{	ETxString, (TText8*)"ERROR\r",		0, ETxEvent|EFailIfTimeOut	},
-
-	{	ERxString, (TText8*)"AT+CGCLASS",	0, ERxEvent	},
-	{	ETxString, (TText8*)"ERROR\r",		0, ETxEvent|EFailIfTimeOut	},
-
-	{	ERxString, (TText8*)"AT+CGQREQ",	0, ERxEvent	},
-	{	ETxString, (TText8*)"ERROR\r",		0, ETxEvent|EFailIfTimeOut	},
-
-	{	ERxString, (TText8*)"AT+CGATT",	0, ERxEvent	},
-	{	ETxString, (TText8*)"ERROR\r",		0, ETxEvent|EFailIfTimeOut	},
-
-	{	ERxString, (TText8*)"AT+CNMI=?",	0, ERxEvent	},
-	{	ETxString, (TText8*)"+CNMI: (0-2),(0,1,3),(0),(0),(0,1)\r",	0, ETxEvent|EFailIfTimeOut	},
-	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
-
-	{	ERxString, (TText8*)"AT+CBST=?",	0, ERxEvent	},
-	{	ETxString, (TText8*)"+CBST: (0-7,12,14-16,34,36,38,39,43,47-51,65,66,68,70,71,75,79-81),(0,2),(1)\r",	0, ETxEvent|EFailIfTimeOut	},
-	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
-
-	{	ERxString, (TText8*)"AT+CSCA?",		0, ERxEvent	},
-	{	ETxString, (TText8*)"+CSCA: \"441632960000\",145",	0, ETxEvent|EFailIfTimeOut	},
-	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
-
-	{	ERxString, (TText8*)"AT+CGREG=1",	0, ERxEvent	},
-	{	ETxString, (TText8*)"ERROR\r",		0, ETxEvent|EFailIfTimeOut	},
-
-	{	ERxString, (TText8*)"AT*ECAM=1",	0, ERxEvent	},
-	{	ETxString, (TText8*)"ERROR\r",		0, ETxEvent|EFailIfTimeOut	},
-
-	//	End of initialization sequence, 
-
-	{	EWait,		NULL,			2, ETimeOutEvent},
-	{	EComplete,	 NULL,					0, 0	}
-	};
-
-class CTestDriveNoCmgf : public CTestBase
-	{
-public:
-	static CTestDriveNoCmgf* NewL(const TScriptList aScriptListEntry);
-	virtual TInt RunTestL();
-
-protected:
-	virtual TInt DriveETelApiL();
-
-private:
-	CTestDriveNoCmgf(const TScriptList aScriptListEntry);
-
-	RMobilePhone iCmgfPhone;
-	TScriptList iScriptListEntry;
-	};
-
-class CTestNoCmgf : public CATScriptEng
-	{
-public:
-	static CTestNoCmgf* NewL(const TScript* aScript);
-	virtual void SpecificAlgorithmL(TInt aParam);
-	virtual void Complete(TInt aError);
-	virtual TInt Start();
-
-private:
-	CTestNoCmgf(const TScript* aScript);
-	void ConstructL();
-
-	const TScript* iScript;
-	};
-
-#endif
+// Copyright (c) 1997-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:
+//
+
+/**
+ @file
+ @internalComponent 
+*/
+
+
+#ifndef __CNOCMGF_H__
+#define __CNOCMGF_H__
+
+#include "Te_LoopbackTestStepBase.h"
+#include "Te_LoopBackScriptEng.h"
+
+//
+// First a Script where everything is in order
+//
+const struct TScript KNoCMGFScript[]= {
+	{	ERxString,	(TText8*)"AT\r",		0, ERxEvent	},
+	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
+
+	{	EIfRxStringJmp, (TText8*)"AT\r",	1, 0	},
+
+	{	ERxString, (TText8*)"AT+FCLASS=?",	0, ERxEvent	},
+	{	ETxString, (TText8*)"0,1,2\r",		0, ETxEvent|EFailIfTimeOut	},
+	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
+
+//
+// The initialisation string - we don't care what it is
+//
+	{	ERxString, (TText8*)"AT",			0, ERxEvent	},
+	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT+CNMI=,0",   0, ERxEvent	},
+	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"ATS7?",		0, ERxEvent	},
+	{	ETxString, (TText8*)"050\r",		0, ETxEvent|EFailIfTimeOut	},
+	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"ATS0=0",		0, ERxEvent	},
+	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT+CGMI",	0, ERxEvent	},
+	{	ETxString, (TText8*)"ERICSSON\r",	0, ETxEvent|EFailIfTimeOut	},
+	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT+CGMM",	0, ERxEvent	},
+	{	ETxString, (TText8*)"1100801\r",	0, ETxEvent|EFailIfTimeOut	},
+	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT+CGMR",	0, ERxEvent	},
+	{	ETxString, (TText8*)"9808261341\r",	0, ETxEvent|EFailIfTimeOut	},
+	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT+CGSN",	0, ERxEvent	},
+	{	ETxString, (TText8*)"520002512954000\r",	0, ETxEvent|EFailIfTimeOut	},
+	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT+CIMI",	0, ERxEvent	},
+	{	ETxString, (TText8*)"ERROR\r",	0, ETxEvent|EFailIfTimeOut	},
+
+// PDU mode not supported - return error to AT+CMGF command 
+	{	ERxString, (TText8*)"AT+CMGF=?",	0, ERxEvent	},
+	{	ETxString, (TText8*)"ERROR\r",	    0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT",	        0, ERxEvent	},
+	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT+CPMS=?",	0, ERxEvent	},
+	{	ETxString, (TText8*)"+CPMS: (\"ME\",\"SM\"),(\"ME\",\"SM\")\r",	0, ETxEvent|EFailIfTimeOut	},
+	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT+CPMS?",	0, ERxEvent	},
+	{	ETxString, (TText8*)"+CPMS: \"SM\",0,15,\"SM\",0,15\r",	0, ETxEvent|EFailIfTimeOut	},
+	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT+CPBS=?",	0, ERxEvent	},
+	{	ETxString, (TText8*)"+CPBS: (\"ME\",\"SM\")\r",	0, ETxEvent|EFailIfTimeOut	},
+	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT+CREG=0",	0, ERxEvent	},
+	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT+CREG=2",	0, ERxEvent	},
+	{	ETxString, (TText8*)"ERROR\r",		0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT+CREG=1",	0, ERxEvent	},
+	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT+CREG?",	0, ERxEvent	},
+	{	ETxString, (TText8*)"ERROR\r",	0, ETxEvent|EFailIfTimeOut	},
+	
+	{	ERxString, (TText8*)"AT+CRC=1",		0, ERxEvent	},
+	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT+COPS?",	0, ERxEvent	},
+	{	ETxString, (TText8*)"+COPS: 0,0,\"UK VODAFONE\"\r",	0, ETxEvent|EFailIfTimeOut	},
+	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT+CBC",	0, ERxEvent	},
+	{	ETxString, (TText8*)"ERROR\r",		0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT+CSQ",	0, ERxEvent	},
+	{	ETxString, (TText8*)"ERROR\r",		0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT+CGCLASS",	0, ERxEvent	},
+	{	ETxString, (TText8*)"ERROR\r",		0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT+CGCLASS",	0, ERxEvent	},
+	{	ETxString, (TText8*)"ERROR\r",		0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT+CGQREQ",	0, ERxEvent	},
+	{	ETxString, (TText8*)"ERROR\r",		0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT+CGATT",	0, ERxEvent	},
+	{	ETxString, (TText8*)"ERROR\r",		0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT+CNMI=?",	0, ERxEvent	},
+	{	ETxString, (TText8*)"+CNMI: (0-2),(0,1,3),(0),(0),(0,1)\r",	0, ETxEvent|EFailIfTimeOut	},
+	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT+CBST=?",	0, ERxEvent	},
+	{	ETxString, (TText8*)"+CBST: (0-7,12,14-16,34,36,38,39,43,47-51,65,66,68,70,71,75,79-81),(0,2),(1)\r",	0, ETxEvent|EFailIfTimeOut	},
+	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT+CSCA?",		0, ERxEvent	},
+	{	ETxString, (TText8*)"+CSCA: \"441632960000\",145",	0, ETxEvent|EFailIfTimeOut	},
+	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT+CGREG=1",	0, ERxEvent	},
+	{	ETxString, (TText8*)"ERROR\r",		0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT*ECAM=1",	0, ERxEvent	},
+	{	ETxString, (TText8*)"ERROR\r",		0, ETxEvent|EFailIfTimeOut	},
+
+	//	End of initialization sequence, 
+
+	{	EWait,		NULL,			2, ETimeOutEvent},
+	{	EComplete,	 NULL,					0, 0	}
+	};
+
+class CTestDriveNoCmgf : public CTestBase
+	{
+public:
+	static CTestDriveNoCmgf* NewL(const TScriptList aScriptListEntry);
+	virtual TInt RunTestL();
+
+protected:
+	virtual TInt DriveETelApiL();
+
+private:
+	CTestDriveNoCmgf(const TScriptList aScriptListEntry);
+
+	RMobilePhone iCmgfPhone;
+	TScriptList iScriptListEntry;
+	};
+
+class CTestNoCmgf : public CATScriptEng
+	{
+public:
+	static CTestNoCmgf* NewL(const TScript* aScript);
+	virtual void SpecificAlgorithmL(TInt aParam);
+	virtual void Complete(TInt aError);
+	virtual TInt Start();
+
+private:
+	CTestNoCmgf(const TScript* aScript);
+	void ConstructL();
+
+	const TScript* iScript;
+	};
+
+#endif